diff --git a/src/daemon.c b/src/daemon.c
index b25ddc4c7..21c700e29 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -577,7 +577,7 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
             swap128(&packet[5 + SERVICE_LENGTH], uuid128);
             gatt_client_discover_characteristics_for_service_by_uuid128(context, &service, uuid128);
             break;
-        case GATT_DISCOVER_CHARACTERISTIC_DESCRIPTOR:
+        case GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS:
             context = daemon_prepare_gatt_client_context(connection, packet);
             if (!context) break;
             daemon_gatt_deserialize_characteristic(packet, 5, &characteristic);
diff --git a/src/hci.h b/src/hci.h
index 216c4bca2..2243e8e99 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -201,7 +201,7 @@ extern "C" {
 #define GATT_FIND_INCLUDED_SERVICES_FOR_SERVICE                  0x73
 #define GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE                0x74
 #define GATT_DISCOVER_CHARACTERISTICS_FOR_SERVICE_BY_UUID128     0x75
-#define GATT_DISCOVER_CHARACTERISTIC_DESCRIPTOR                  0x76
+#define GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS                 0x76
 #define GATT_READ_VALUE_OF_CHARACTERISTIC                        0x77
 #define GATT_READ_LONG_VALUE_OF_CHARACTERISTIC                   0x78
 #define GATT_WRITE_VALUE_OF_CHARACTERISTIC_WITHOUT_RESPONSE      0x79
diff --git a/src/hci_cmds.c b/src/hci_cmds.c
index bf4c56330..fcf3b02a1 100644
--- a/src/hci_cmds.c
+++ b/src/hci_cmds.c
@@ -837,7 +837,7 @@ const hci_cmd_t gatt_discover_characteristics_for_service_by_uuid128_cmd = {
  * @param characteristic
  */
 const hci_cmd_t gatt_discover_characteristic_descriptors_cmd = {
-    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTIC_DESCRIPTOR), "HY"
+    OPCODE(OGF_BTSTACK, GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS), "HY"
 };
 
 /**