diff --git a/src/gatt-database.c b/src/gatt-database.c
index bbeb7cd..f182fd0 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -1964,7 +1964,7 @@ static bool database_add_chrc(struct external_service *service,
 		struct external_desc *desc = entry->data;
 
 		if (desc->handled || g_strcmp0(desc->chrc_path, chrc->path))
-			continue;
+			goto next;
 
 		if (!database_add_desc(service, desc)) {
 			chrc->attrib = NULL;
@@ -1972,6 +1972,7 @@ static bool database_add_chrc(struct external_service *service,
 			return false;
 		}
 
+next:
 		entry = entry->next;
 	}