diff --git a/android/gatt.c b/android/gatt.c
index ddc4545..41409ad 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -6494,15 +6494,8 @@ static void device_info_read_cb(struct gatt_db_attribute *attrib,
 					uint8_t opcode, bdaddr_t *bdaddr,
 					void *user_data)
 {
-	struct gatt_device *dev;
 	char *buf = user_data;
 
-	dev = find_device_by_addr(bdaddr);
-	if (!dev) {
-		error("gatt: Could not find device ?!");
-		return;
-	}
-
 	gatt_db_attribute_read_result(attrib, id, 0, user_data, strlen(buf));
 }
 
@@ -6511,15 +6504,8 @@ static void device_info_read_system_id_cb(struct gatt_db_attribute *attrib,
 					uint8_t opcode, bdaddr_t *bdaddr,
 					void *user_data)
 {
-	struct gatt_device *dev;
 	uint8_t pdu[8];
 
-	dev = find_device_by_addr(bdaddr);
-	if (!dev) {
-		error("gatt: Could not find device ?!");
-		return;
-	}
-
 	put_le64(bt_config_get_system_id(), pdu);
 
 	gatt_db_attribute_read_result(attrib, id, 0, pdu, sizeof(pdu));
@@ -6530,15 +6516,8 @@ static void device_info_read_pnp_id_cb(struct gatt_db_attribute *attrib,
 					uint8_t opcode, bdaddr_t *bdaddr,
 					void *user_data)
 {
-	struct gatt_device *dev;
 	uint8_t pdu[7];
 
-	dev = find_device_by_addr(bdaddr);
-	if (!dev) {
-		error("gatt: Could not find device ?!");
-		return;
-	}
-
 	pdu[0] = bt_config_get_pnp_source();
 	put_le16(bt_config_get_pnp_vendor(), &pdu[1]);
 	put_le16(bt_config_get_pnp_product(), &pdu[3]);