diff --git a/look-and-feel/contents/lockscreen/Keypad.qml b/look-and-feel/contents/lockscreen/Keypad.qml
index 6be2b1d8..88ac83d2 100644
--- a/look-and-feel/contents/lockscreen/Keypad.qml
+++ b/look-and-feel/contents/lockscreen/Keypad.qml
@@ -59,7 +59,10 @@ Rectangle {
     }
     
     function enter() {
-        keypadRoot.waitingForAuth = true;
+        if (root.password !== "") { // prevent typing lock when password is empty
+            keypadRoot.waitingForAuth = true;
+        }
+        
         // don't try to unlock if there is a timeout (unlock once unlocked)
         if (!authenticator.graceLocked) {
             authenticator.tryUnlock(root.password);