diff --git a/libs/key-management-ui/src/lock/components/lock.component.ts b/libs/key-management-ui/src/lock/components/lock.component.ts
index 63152e8cb19..4661a4167fd 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.ts
+++ b/libs/key-management-ui/src/lock/components/lock.component.ts
@@ -527,8 +527,11 @@ export class LockComponent implements OnInit, OnDestroy {
         this.enforcedMasterPasswordOptions = MasterPasswordPolicyOptions.fromResponse(
           masterPasswordVerificationResponse.policyOptions,
         );
-        passwordValid = true;
+      } else {
+        this.enforcedMasterPasswordOptions = undefined;
       }
+
+      passwordValid = true;
     } catch (e) {
       this.logService.error(e);
     }