diff --git a/main/displays/lockscreen.cpp b/main/displays/lockscreen.cpp
index ae620c5..a1d51d5 100644
--- a/main/displays/lockscreen.cpp
+++ b/main/displays/lockscreen.cpp
@@ -121,7 +121,7 @@ LOCKSCREEN_PLUGIN_FIXES_1
                 if (!gas || !brems || *gas > 200.f || *brems > 200.f)
                     espgui::switchScreen<PotisCalibrateDisplay>(true);
                 else
-                    espgui::switchScreen<MainMenu>();
+                    espgui::popScreen();
 #ifdef LOCKSCREEN_PLUGIN_FIXES_2
 LOCKSCREEN_PLUGIN_FIXES_2
 #endif
diff --git a/main/main.cpp b/main/main.cpp
index 42bc4c1..6c41092 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -93,7 +93,8 @@ extern "C" void app_main()
     }
     else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value())
     {
-        espgui::switchScreen<Lockscreen>();
+        espgui::switchScreen<StatusDisplay>();
+        espgui::pushScreen<Lockscreen>();
     }
     else
     {