diff --git a/libs/common/src/platform/services/crypto.service.ts b/libs/common/src/platform/services/crypto.service.ts
index e6860dadf3..8ce2b5e1a0 100644
--- a/libs/common/src/platform/services/crypto.service.ts
+++ b/libs/common/src/platform/services/crypto.service.ts
@@ -945,6 +945,10 @@ export class CryptoService implements CryptoServiceAbstraction {
   }
 
   private async derivePublicKey(privateKey: UserPrivateKey) {
+    if (privateKey == null) {
+      return null;
+    }
+
     return (await this.cryptoFunctionService.rsaExtractPublicKey(privateKey)) as UserPublicKey;
   }