diff --git a/targets/stm32l432/lib/usbd/usbd_hid.c b/targets/stm32l432/lib/usbd/usbd_hid.c
index a1950c3..bf32911 100644
--- a/targets/stm32l432/lib/usbd/usbd_hid.c
+++ b/targets/stm32l432/lib/usbd/usbd_hid.c
@@ -114,15 +114,10 @@ USBD_ClassTypeDef  USBD_HID =
   NULL,
 
 
-
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  // USBD_HID_GetFSCfgDesc,
-  // USBD_HID_GetFSCfgDesc,
-  // USBD_HID_GetFSCfgDesc,
-  // USBD_HID_GetDeviceQualifierDesc,
+  USBD_HID_GetFSCfgDesc,
+  USBD_HID_GetFSCfgDesc,
+  USBD_HID_GetFSCfgDesc,
+  USBD_HID_GetDeviceQualifierDesc,
 };
 
 #define USBD_HID_CfgHSDesc USBD_HID_OtherSpeedCfgDesc
diff --git a/targets/stm32l432/src/init.c b/targets/stm32l432/src/init.c
index daa81d0..8916ba7 100644
--- a/targets/stm32l432/src/init.c
+++ b/targets/stm32l432/src/init.c
@@ -208,7 +208,7 @@ void usb_init()
     // Enable USB Clock
     SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_USBFSEN);
 
-
+#if DEBUG_LEVEL > 0
     USBD_Composite_Set_Classes(&USBD_HID, &USBD_CDC);
     in_endpoint_to_class[HID_EPIN_ADDR & 0x7F] = 0;
     out_endpoint_to_class[HID_EPOUT_ADDR & 0x7F] = 0;
@@ -222,6 +222,10 @@ void usb_init()
     //
     // USBD_RegisterClass(&Solo_USBD_Device, &USBD_CDC);
     USBD_CDC_RegisterInterface(&Solo_USBD_Device, &USBD_Interface_fops_FS);
+#else
+    USBD_Init(&Solo_USBD_Device, &Solo_Desc, 0);
+    USBD_RegisterClass(&Solo_USBD_Device, &USBD_HID);
+#endif
 
     USBD_Start(&Solo_USBD_Device);
 }