diff --git a/src/adapter.c b/src/adapter.c
index 28063ad..47cd39e 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2367,7 +2367,7 @@ static void set_mode_complete(struct btd_adapter *adapter)
 
 int btd_adapter_stop(struct btd_adapter *adapter)
 {
-	gboolean powered, discoverable, pairable;
+	gboolean powered, discoverable, pairable, discovering;
 
 	/* cancel pending timeout */
 	if (adapter->discov_timeout_id) {
@@ -2404,6 +2404,13 @@ int btd_adapter_stop(struct btd_adapter *adapter)
 					DBUS_TYPE_BOOLEAN, &pairable);
 	}
 
+	if (adapter->state != STATE_IDLE) {
+		discovering = FALSE;
+		emit_property_changed(connection, adapter->path,
+					ADAPTER_INTERFACE, "Discovering",
+					DBUS_TYPE_BOOLEAN, &discovering);
+	}
+
 	powered = FALSE;
 	emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE,
 				"Powered", DBUS_TYPE_BOOLEAN, &powered);