diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_interface_lockscreen.c b/applications/main/momentum_app/scenes/momentum_app_scene_interface_lockscreen.c
index f879ddf12..5ab144cfb 100644
--- a/applications/main/momentum_app/scenes/momentum_app_scene_interface_lockscreen.c
+++ b/applications/main/momentum_app/scenes/momentum_app_scene_interface_lockscreen.c
@@ -117,7 +117,7 @@ void momentum_app_scene_interface_lockscreen_on_enter(void* context) {
 
     item = variable_item_list_add(
         var_item_list,
-        "Lock on Boot",
+        "Lock on Boot if PIN set",
         2,
         momentum_app_scene_interface_lockscreen_lock_on_boot_changed,
         app);
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index d2178a5e2..0d5ac9565 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -556,7 +556,8 @@ int32_t desktop_srv(void* p) {
 
     scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain);
 
-    if(momentum_settings.lock_on_boot || furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) {
+    if(desktop_pin_code_is_set() &&
+       (momentum_settings.lock_on_boot || furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock))) {
         desktop_lock(desktop, true);
     }
 
diff --git a/lib/momentum/settings.c b/lib/momentum/settings.c
index 9da9a4762..822a82115 100644
--- a/lib/momentum/settings.c
+++ b/lib/momentum/settings.c
@@ -12,7 +12,7 @@ MomentumSettings momentum_settings = {
     .cycle_anims = 0, // Meta.txt
     .unlock_anims = false, // OFF
     .menu_style = MenuStyleDsi, // DSi
-    .lock_on_boot = false, // OFF
+    .lock_on_boot = true, // ON
     .bad_pins_format = false, // OFF
     .allow_locked_rpc_usb = false, // OFF
     .allow_locked_rpc_ble = false, // OFF