diff --git a/libs/common/src/platform/services/crypto.service.ts b/libs/common/src/platform/services/crypto.service.ts
index 9a36ea4cf0..14f5827c67 100644
--- a/libs/common/src/platform/services/crypto.service.ts
+++ b/libs/common/src/platform/services/crypto.service.ts
@@ -311,7 +311,7 @@ export class CryptoService implements CryptoServiceAbstraction {
 
     const encOrgKeyData = await this.stateService.getEncryptedOrganizationKeys();
     if (encOrgKeyData == null) {
-      return null;
+      return result;
     }
 
     let setKey = false;