diff --git a/src/event.c b/src/event.c
index ed1b66f..7fb71a1 100644
--- a/src/event.c
+++ b/src/event.c
@@ -85,17 +85,12 @@ static gboolean get_adapter_and_device(const bdaddr_t *src, bdaddr_t *dst,
 void btd_event_remote_name(const bdaddr_t *local, bdaddr_t *peer,
 							const char *name)
 {
-	struct btd_adapter *adapter;
-	struct btd_device *device;
 	char filename[PATH_MAX + 1];
 	char local_addr[18], peer_addr[18];
 	GKeyFile *key_file;
 	gsize length = 0;
 	char *data;
 
-	if (!get_adapter_and_device(local, peer, &adapter, &device, FALSE))
-		return;
-
 	ba2str(local, local_addr);
 	ba2str(peer, peer_addr);
 	snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", local_addr,
@@ -112,9 +107,6 @@ void btd_event_remote_name(const bdaddr_t *local, bdaddr_t *peer,
 	g_free(data);
 
 	g_key_file_free(key_file);
-
-	if (device)
-		device_set_name(device, name);
 }
 
 static void store_longtermkey(bdaddr_t *local, bdaddr_t *peer,
diff --git a/src/mgmt.c b/src/mgmt.c
index 26ee8ca..6dc7cef 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -537,9 +537,11 @@ static void mgmt_device_connected(int sk, uint16_t index, void *buf, size_t len)
 
 	adapter_add_connection(adapter, device);
 
-	if (eir_data.name != NULL)
+	if (eir_data.name != NULL) {
 		btd_event_remote_name(&info->bdaddr, &ev->addr.bdaddr,
 								eir_data.name);
+		device_set_name(device, eir_data.name);
+	}
 
 	eir_data_free(&eir_data);
 }