diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 3e6911e9..61f8aa95 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -1404,10 +1404,13 @@ unsigned char cfgDesc_Audio2[] =
 #endif
 #endif
 
+
+#define STR_USENG 0x0409
+
 static unsigned char strDescs[][40] = 
 {
-    "Langids",                                  // 0     LangIDs place holder
-    APPEND_VENDOR_STR(),                       // 1     iManufacturer (at MANUFACTURER_STRING_INDEX)
+    { STR_USENG & 0xff, STR_USENG >> 8, '\0'},   // 0     LangID
+    APPEND_VENDOR_STR(),                        // 1     iManufacturer (at MANUFACTURER_STRING_INDEX)
 
     "",//SERIAL_STR,                            // 2     iSerialNumber (at SERIAL_STR_INDEX)
     
diff --git a/module_usb_audio/endpoint0/endpoint0.xc b/module_usb_audio/endpoint0/endpoint0.xc
index b69e66a0..5bdd6205 100755
--- a/module_usb_audio/endpoint0/endpoint0.xc
+++ b/module_usb_audio/endpoint0/endpoint0.xc
@@ -100,24 +100,11 @@ unsigned g_curUsbSpeed = 0;
 extern unsigned g_iap_reset;
 #endif
 
-
-#define STR_USENG 0x0409
-
-#define DESC_STR_LANGIDS \
-{ \
-  STR_USENG & 0xff,              /* 2  wLangID[0] */ \
-  STR_USENG>>8,                  /* 3  wLangID[0] */ \
-  '\0' \
-}
-
 #ifdef NATIVE_DSD
 /* We remember if we are in DSD mode to avoid Configuring the DAC too often - thus avoiding pops and clicks */
 unsigned g_dsdMode = 0;
 #endif
 
-/* String descriptors */
-static unsigned char strDesc_langIDs[] = DESC_STR_LANGIDS;
-
 void VendorAudioRequestsInit(chanend c_audioControl, chanend ?c_mix_ctl, chanend ?c_clk_ctl);
 
 /* Endpoint 0 function.  Handles all requests to the device */
@@ -193,8 +180,6 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
     }
 #endif
 
-    safememcpy(strDescs[0], strDesc_langIDs, sizeof(strDesc_langIDs));
-
     /* Build up channel string table - By default all channels are marked as analogue
      * TODO We really want to do this an build time... */
 #if defined(SPDIF_RX) && (SPDIF_RX_INDEX != 0)