diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index c591c9e..57d3e1f 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
for (i = 0; i < chrc_count; i++) {
op->cur_chrc_index = i;
op->cur_chrc = chrcs + i;
- desc_start = chrcs[i].chrc_external.value_handle + 1;
- if (desc_start > chrcs[i].chrc_external.end_handle)
+ desc_start = chrcs[i].chrc_external.value_handle;
+ if (desc_start++ == chrcs[i].chrc_external.end_handle)
continue;
if (bt_gatt_discover_descriptors(client->att, desc_start,