diff --git a/src/device.c b/src/device.c
index bd513ec..f001502 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1153,6 +1153,9 @@ static void device_profile_connected(struct btd_device *dev,
 
 	DBG("%s %s (%d)", profile->name, strerror(-err), -err);
 
+	if (!err)
+		device_set_temporary(dev, FALSE);
+
 	if (dev->pending == NULL)
 		return;
 
@@ -1794,8 +1797,6 @@ void device_add_connection(struct btd_device *device)
 		return;
 	}
 
-	device_set_temporary(device, FALSE);
-
 	device->connected = TRUE;
 
 	g_dbus_emit_property_changed(dbus_conn, device->path,