1 files changed, 1 insertions, 5 deletions

diff --git a/apps/main.c b/apps/main.c
index 642ec5be08..1ff4032f6e 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -139,10 +139,6 @@ static void app_main(void)
     viewportmanager_set_statusbar(VP_SB_ALLSCREENS);
     add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, 
               viewportmanager_statusbar_changed);
-#ifdef HAVE_USBSTACK
-    /* All threads should be created and public queues registered by now */
-    usb_start_monitoring();
-#endif
     root_menu();
 }
 
@@ -459,7 +455,7 @@ static void init(void)
     eeprom_settings_init();
 #endif
 
-#ifndef HAVE_USBSTACK
+#if !defined(HAVE_USBSTACK) || defined(USE_ROCKBOX_USB)
     usb_start_monitoring();
     while (usb_detect() == USB_INSERTED)
     {