diff --git a/src/adapter.c b/src/adapter.c
index 7d4bc36..8b3bce0 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2613,8 +2613,10 @@ static void load_config(struct btd_adapter *adapter)
 	}
 
 	mgmt_set_connectable(adapter->dev_id, TRUE);
-	mgmt_set_discoverable(adapter->dev_id, adapter->discoverable,
-				adapter->discov_timeout);
+
+	if (adapter->discov_timeout == 0)
+		mgmt_set_discoverable(adapter->dev_id, adapter->discoverable,
+						adapter->discov_timeout);
 
 	g_key_file_free(key_file);
 }