diff --git a/apps/main.c b/apps/main.c
index cf7d302fc9..513a6eec7c 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -509,6 +509,7 @@ static void init(void)
 #elif CONFIG_USBOTG == USBOTG_M5636
     m5636_init();
 #endif
+    usb_start_monitoring();

     backlight_init();

@@ -611,7 +612,9 @@ static void init(void)

             while(button_get(true) != SYS_USB_CONNECTED) {};
             gui_usb_screen_run(true);
+#if !(CONFIG_STORAGE & STORAGE_RAMDISK)
             system_reboot();
+#endif
         }
     }

diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index 50aa5d8e8c..4c3fd65402 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -10,9 +10,9 @@
 #define MODEL_NAME   "Apple iPod Classic/6G"

 /* define this if you use an ATA controller */
-#define CONFIG_STORAGE STORAGE_ATA
+#define CONFIG_STORAGE STORAGE_RAMDISK

 #define HAVE_ATA_DMA
 #define ATA_MAX_UDMA 4
 #define ATA_MAX_MWDMA 2

diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 81d90d01db..b2077803d5 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -793,6 +793,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
     switch (cbw->command_block[0]) {
         case SCSI_TEST_UNIT_READY:
             logf("scsi test_unit_ready %d",lun);
+#if !(CONFIG_STORAGE & STORAGE_RAMDISK)
             if(!usb_exclusive_storage()) {
                 send_csw(UMS_STATUS_FAIL);
                 cur_sense_data.sense_key=SENSE_NOT_READY;
@@ -800,6 +801,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                 cur_sense_data.ascq=0;
                 break;
             }
+#endif
             if(lun_present) {
                 send_csw(UMS_STATUS_GOOD);
             }