diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 30e7253da..f4837bfb0 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -131,8 +131,9 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         DESKTOP_SETTINGS_LOAD(&desktop->settings);
 
         desktop_clock_reconfigure(desktop);
-
-        desktop_auto_lock_arm(desktop);
+        if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) {
+            desktop_auto_lock_arm(desktop);
+        }
         return true;
     case DesktopGlobalAutoLock:
         if(!loader_is_locked(desktop->loader)) {
diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c
index b6ab9344b..67cebfaab 100644
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -224,8 +224,7 @@ void desktop_view_locked_close_doors(DesktopViewLocked* locked_view) {
 
 void desktop_view_locked_lock(DesktopViewLocked* locked_view, bool pin_locked) {
     DesktopViewLockedModel* model = view_get_model(locked_view->view);
-    // TODO: Fix!!!!!!!!!!!
-    //furi_assert(model->view_state == DesktopViewLockedStateUnlocked);
+    furi_assert(model->view_state == DesktopViewLockedStateUnlocked);
     model->view_state = DesktopViewLockedStateLocked;
     model->pin_locked = pin_locked;
     view_commit_model(locked_view->view, true);