diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 4e42b4104..ed2776f0e 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -493,7 +493,7 @@ int32_t desktop_srv(void* p) {
     Desktop* desktop = desktop_alloc();
 
     bool ok = DESKTOP_SETTINGS_LOAD(&desktop->settings);
-    if(ok) {
+    if(ok && desktop->settings.pin_code.length) {
         ok = desktop_pin_is_valid(&desktop->settings.pin_code);
     }
     if(!ok) {