diff --git a/attrib/client.c b/attrib/client.c
index 651eade..ce78ed6 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -902,6 +902,7 @@ static void char_discovered_cb(GSList *characteristics, guint8 status,
 		previous_end = &chr->end;
 
 		gatt->chars = g_slist_append(gatt->chars, chr);
+		register_characteristic(chr, gatt->path);
 	}
 
 	if (previous_end)
@@ -910,8 +911,6 @@ static void char_discovered_cb(GSList *characteristics, guint8 status,
 	gatt_get_address(gatt, &sba, &dba);
 	store_characteristics(&sba, &dba, prim->range.start, gatt->chars);
 
-	g_slist_foreach(gatt->chars, register_characteristic, gatt->path);
-
 	g_slist_foreach(gatt->chars, update_all_chars, gatt);
 
 	reply = create_discover_char_reply(gatt->query->msg, gatt->chars);