Index: apps/main.c
===================================================================
--- apps/main.c	(revision 21012)
+++ apps/main.c	(working copy)
@@ -139,10 +139,6 @@
     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 @@
     eeprom_settings_init();
 #endif
 
-#ifndef HAVE_USBSTACK
+#if !defined(HAVE_USBSTACK) || defined(USE_ROCKBOX_USB)
     usb_start_monitoring();
     while (usb_detect() == USB_INSERTED)
     {