diff --git a/src/adapter.c b/src/adapter.c
index b2d19dd..16fd858 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3132,6 +3132,9 @@ void adapter_set_pairable(struct btd_adapter *adapter, bool enable)
 {
 	bool current = (adapter->current_settings & MGMT_SETTING_PAIRABLE);
 
+	if (main_opts.always_pairable)
+		return;
+
 	if (current == enable)
 		return;
 
diff --git a/src/agent.c b/src/agent.c
index af96528..3e6b925 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -153,8 +153,7 @@ static void set_io_cap(struct btd_adapter *adapter, gpointer user_data)
 
 	adapter_set_io_capability(adapter, io_cap);
 
-	if (!main_opts.always_pairable)
-		adapter_set_pairable(adapter, agent ? true : false);
+	adapter_set_pairable(adapter, agent ? true : false);
 }
 
 static bool add_default_agent(struct agent *agent)