diff --git a/src/adapter.c b/src/adapter.c
index 60509ec..14b3874 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1094,8 +1094,6 @@ static struct btd_device *adapter_create_device(struct btd_adapter *adapter,
 	if (!device)
 		return NULL;
 
-	btd_device_set_temporary(device, TRUE);
-
 	adapter->devices = g_slist_append(adapter->devices, device);
 
 	return device;
diff --git a/src/device.c b/src/device.c
index 397233b..d9b5d15 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2333,6 +2333,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
 
 	str2ba(address, &device->bdaddr);
 	device->adapter = adapter;
+	device->temporary = TRUE;
 
 	return btd_device_ref(device);
 }