diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index 3ade53634c..c6c6a7aa2b 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -134,6 +134,9 @@ export class CipherService implements CipherServiceAbstraction {
 
         if (key == null && cipher.organizationId != null) {
             key = await this.cryptoService.getOrgKey(cipher.organizationId);
+            if (key == null) {
+                throw new Error('Cannot encrypt cipher for organization. No key.');
+            }
         }
         await Promise.all([
             this.encryptObjProperty(model, cipher, {