diff --git a/src/gatt-database.c b/src/gatt-database.c
index 2c2526f..5e2390b 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -324,7 +324,7 @@
 	if (!device)
 		goto remove;
 
-	if (device_is_paired(device, state->bdaddr_type))
+	if (device_is_bonded(device, state->bdaddr_type))
 		return;
 
 remove:
@@ -1125,7 +1125,7 @@
 
 	server = btd_device_get_gatt_server(device);
 	if (!server) {
-		if (!device_is_paired(device, device_state->bdaddr_type))
+		if (!device_is_bonded(device, device_state->bdaddr_type))
 			goto remove;
 		state_set_pending(device_state, notify);
 		return;