diff --git a/core/src/apps/debug/__init__.py b/core/src/apps/debug/__init__.py
index 03213ee2b..c8f8f33de 100644
--- a/core/src/apps/debug/__init__.py
+++ b/core/src/apps/debug/__init__.py
@@ -205,10 +205,6 @@ if __debug__:
         return Success()
 
     def boot() -> None:
-        # wipe storage when debug build is used on real hardware
-        if not utils.EMULATOR:
-            config.wipe()
-
         workflow_handlers.register(MessageType.DebugLinkDecision, dispatch_DebugLinkDecision)  # type: ignore
         workflow_handlers.register(MessageType.DebugLinkGetState, dispatch_DebugLinkGetState)  # type: ignore
         workflow_handlers.register(
diff --git a/core/src/boot.py b/core/src/boot.py
index 9ba0fd3a8..cd1f31ae3 100644
--- a/core/src/boot.py
+++ b/core/src/boot.py
@@ -33,5 +33,9 @@ async def bootscreen() -> None:
 ui.display.backlight(ui.BACKLIGHT_NONE)
 ui.backlight_fade(ui.BACKLIGHT_NORMAL)
 config.init(show_pin_timeout)
+
+if __debug__ and not utils.EMULATOR:
+    config.wipe()
+
 loop.schedule(bootscreen())
 loop.run()