diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index bc4c0f53..44b9b7ea 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -1973,14 +1973,14 @@ unsigned char cfgDesc_Audio1[] =
 #ifdef OUTPUT
     /* CS_Interface Input Terminal 1 Descriptor - USB streaming Host to Device */
     0x0C,
-    UAC_CS_DESCTYPE_INTERFACE,                   /* UAC_CS_DESCTYPE_INTERFACE */
+    UAC_CS_DESCTYPE_INTERFACE,      /* UAC_CS_DESCTYPE_INTERFACE */
     0x02,                           /* INPUT_TERMINAL */
     0x01,                           /* Terminal ID */
     0x01, 0x01,                     /* Type - streaming */
     0x00,                           /* Associated terminal - unused  */
     NUM_USB_CHAN_OUT_FS,            /* bNrChannels */
     0x03, 0x00,                     /* wChannelConfig */
-    0x00,                           /* iChannelNames - Unused */
+    offsetof(StringDescTable_t, outputChanStr_1)/sizeof(char *), /* iChannelNames */
     11,                             /* iTerminal */
 
     /* CS_Interface class specific AC interface feature unit descriptor - mute & volume for dac */
@@ -2017,7 +2017,7 @@ unsigned char cfgDesc_Audio1[] =
     0x00,                           /* Associated terminal - unused  */
     NUM_USB_CHAN_IN_FS,             /* bNrChannels */
     0x03, 0x00,                     /* wChannelConfigs */
-    0x00,                           /* iChannelNames */
+    offsetof(StringDescTable_t, inputChanStr_1)/sizeof(char *), /* iChannelNames */
     12,                             /* iTerminal */
 
     /* CS_Interface Output Terminal Descriptor - USB Streaming Device to Host*/
@@ -2043,7 +2043,6 @@ unsigned char cfgDesc_Audio1[] =
     0x00,                           /* String table index */
 #endif
 
-
 #ifdef OUTPUT
     /* Standard AS Interface Descriptor (4.5.1) */
     0x09,                           /* bLength */