diff --git a/src/adapter.c b/src/adapter.c
index 7c2aec0..3b24816 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -556,8 +556,6 @@ static void discovery_cleanup(struct btd_adapter *adapter)
 {
 	struct discovery *discovery = adapter->discovery;
 
-	adapter->discovery = NULL;
-
 	if (!discovery)
 		return;
 
@@ -566,6 +564,8 @@ static void discovery_cleanup(struct btd_adapter *adapter)
 
 	send_devices_found(adapter);
 
+	adapter->discovery = NULL;
+
 	g_slist_free_full(discovery->found, invalidate_rssi);
 
 	g_free(discovery);