diff --git a/src/gatt-database.c b/src/gatt-database.c
index 1cdc72e..0ac5b75 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -3330,6 +3330,9 @@
 	uint8_t value[4];
 	uint16_t handle, ccc_handle;
 
+	if (!database)
+		return;
+
 	handle = gatt_db_attribute_get_handle(database->svc_chngd);
 	ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);