diff --git a/src/adapter.c b/src/adapter.c
index 839b0f5..886bca1 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -5490,6 +5490,9 @@ static int adapter_register(struct btd_adapter *adapter)
 		return -EINVAL;
 	}
 
+	if (adapters == NULL)
+		adapter->is_default = true;
+
 	adapters = g_slist_append(adapters, adapter);
 
 	agent = agent_get(NULL);
@@ -5517,9 +5520,6 @@ static int adapter_register(struct btd_adapter *adapter)
 
 	adapter->initialized = TRUE;
 
-	if (g_slist_length(adapters) == 1)
-		adapter->is_default = true;
-
 	if (main_opts.did_source)
 		set_did(adapter, main_opts.did_vendor, main_opts.did_product,
 				main_opts.did_version, main_opts.did_source);