diff --git a/apps/screens.c b/apps/screens.c
index e4919fdcbd..fee4b40c09 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -161,6 +161,9 @@ void usb_screen(void)
     int i;
     int usb_bars = VP_SB_ALLSCREENS; /* force statusbars */
     int old_bars  = viewportmanager_get_statusbar();
+#ifdef USB_ENABLE_HID
+    char mode_name[MODE_NAME_LEN];
+#endif
 #if defined HAVE_TOUCHSCREEN
     enum touchscreen_mode old_mode = touchscreen_get_mode();
 
@@ -195,7 +198,6 @@ void usb_screen(void)
             else
 #endif
             {
-                char mode_name[MODE_NAME_LEN];
 #ifdef HAVE_LCD_BITMAP
                 screens[i].transparent_bitmap(usblogo,
                         (LCD_WIDTH-BMPWIDTH_usblogo),
diff --git a/firmware/usbstack/usb_hid.c b/firmware/usbstack/usb_hid.c
index 4e9795b210..2f592fcacd 100644
--- a/firmware/usbstack/usb_hid.c
+++ b/firmware/usbstack/usb_hid.c
@@ -90,7 +90,6 @@
 #define HID_NUM_BUFFERS                 5
 #define SET_REPORT_BUF_LEN 2
 
-//#ifdef LOGF_ENABLE
 #ifdef LOGF_ENABLE
 
 #define BUF_DUMP_BUF_LEN       HID_BUF_SIZE_REPORT