diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index e2d58cf0a9..f8d8f4b3ff 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -399,7 +399,7 @@ void usb_storage_init_connection(void)
     state = WAITING_FOR_COMMAND;
 
 #if CONFIG_CPU == IMX31L || CONFIG_USBOTG == USBOTG_ISP1583 || \
-        defined(CPU_TCC77X) || defined(CPU_TCC780X)
+        defined(CPU_TCC77X) || defined(CPU_TCC780X) || defined(BOOTLOADER)
     static unsigned char _transfer_buffer[BUFFER_SIZE*2]
         USB_DEVBSS_ATTR __attribute__((aligned(32)));
     tb.transfer_buffer = (void *)_transfer_buffer;
@@ -412,9 +412,9 @@ void usb_storage_init_connection(void)
     tb.transfer_buffer =
         (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0);
     invalidate_icache();
+#endif
 #ifdef USB_USE_RAMDISK
     ramdisk_buffer = tb.transfer_buffer + BUFFER_SIZE*2;
-#endif
 #endif
     usb_drv_recv(ep_out, tb.transfer_buffer, 1024);
 }