diff --git a/src/adapter.c b/src/adapter.c
index 82087c1..2747f9c 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -599,9 +599,6 @@ static void trigger_pairable_timeout(struct btd_adapter *adapter)
 		adapter->pairable_timeout_id = 0;
 	}
 
-	g_dbus_emit_property_changed(dbus_conn, adapter->path,
-					ADAPTER_INTERFACE, "PairableTimeout");
-
 	if (!(adapter->current_settings & MGMT_SETTING_PAIRABLE))
 		return;
 
@@ -2170,6 +2167,9 @@ static void property_set_pairable_timeout(const GDBusPropertyTable *property,
 
 	store_adapter_info(adapter);
 
+	g_dbus_emit_property_changed(dbus_conn, adapter->path,
+					ADAPTER_INTERFACE, "PairableTimeout");
+
 	trigger_pairable_timeout(adapter);
 }