diff --git a/firmware/export/config.h b/firmware/export/config.h
index 979a14d0c9..de47e5ebc3 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1046,7 +1046,7 @@ Lyre prototype 1 */
     ((defined(CREATIVE_ZVx) || \
      defined(CPU_TCC77X) || defined(CPU_TCC780X))) || \
      (CONFIG_USBOTG == USBOTG_JZ4740) || defined(IPOD_NANO2G) || \
-     CONFIG_USBOTG == USBOTG_AS3525
+     CONFIG_USBOTG == USBOTG_AS3525 || CONFIG_USBOTG == USBOTG_AS3525v2
 #define USB_ENABLE_STORAGE
 #endif
 
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index e48bd5b372..f33dee652a 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -1018,12 +1018,12 @@ void sd_enable(bool on)
         bitclr32(&CGU_PERI, CGU_MCI_CLOCK_ENABLE);
     }
 }
+#endif /* BOOTLOADER */
 
 tCardInfo *card_get_info_target(int card_no)
 {
     return &card_info[card_no];
 }
-#endif /* BOOTLOADER */
 
 #ifdef HAVE_HOTSWAP
 bool sd_removable(IF_MD_NONVOID(int drive))