diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts
index 56f601da56..7164b0ae4f 100644
--- a/libs/common/src/auth/services/auth.service.ts
+++ b/libs/common/src/auth/services/auth.service.ts
@@ -304,13 +304,16 @@ export class AuthService implements AuthServiceAbstraction {
       ).encKey,
       pubKey.buffer
     );
-    const encryptedMasterPassword = await this.cryptoService.rsaEncrypt(
-      Utils.fromUtf8ToArray(await this.stateService.getKeyHash()),
-      pubKey.buffer
-    );
+    let encryptedMasterPassword = null;
+    if ((await this.stateService.getKeyHash()) != null) {
+      encryptedMasterPassword = await this.cryptoService.rsaEncrypt(
+        Utils.fromUtf8ToArray(await this.stateService.getKeyHash()),
+        pubKey.buffer
+      );
+    }
     const request = new PasswordlessAuthRequest(
       encryptedKey.encryptedString,
-      encryptedMasterPassword.encryptedString,
+      encryptedMasterPassword?.encryptedString,
       await this.appIdService.getAppId(),
       requestApproved
     );