diff --git a/firmware/export/config.h b/firmware/export/config.h
index 5366e41752..163b59cd03 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -772,18 +772,7 @@ Lyre prototype 1*/
 #endif /* CONFIG_USBOTG */
 
 /* define the class drivers to enable */
-#ifndef BOOTLOADER
-
-//#define USB_ENABLE_SERIAL
-#define USB_ENABLE_STORAGE
-
-#ifdef USB_HAS_INTERRUPT
-#define USB_ENABLE_HID
-#else
-#define USB_ENABLE_CHARGING_ONLY
-#endif
-
-#else /* BOOTLOADER */
+#ifdef BOOTLOADER
 
 /* enable usb storage for targets that do bootloader usb */
 #if  (defined(TOSHIBA_GIGABEAT_S) || \
@@ -793,6 +782,16 @@ Lyre prototype 1*/
 #define USB_ENABLE_STORAGE
 #endif
 
+#else /* BOOTLOADER */
+
+//#define USB_ENABLE_SERIAL
+
+#ifdef USB_HAS_INTERRUPT
+#define USB_ENABLE_HID
+#else
+#define USB_ENABLE_CHARGING_ONLY
+#endif
+
 #endif /* BOOTLOADER */
 
 #endif /* HAVE_USBSTACK */