diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index 762b2bd3688..798821f0567 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -448,12 +448,12 @@ export class CipherService implements CipherServiceAbstraction { if (await this.configService.getFeatureFlag(FeatureFlag.PM4154_BulkEncryptionService)) { return await this.bulkEncryptService.decryptItems( groupedCiphers, - keys.orgKeys[orgId as OrganizationId] ?? keys.userKey, + keys.orgKeys?.[orgId as OrganizationId] ?? keys.userKey, ); } else { return await this.encryptService.decryptItems( groupedCiphers, - keys.orgKeys[orgId as OrganizationId] ?? keys.userKey, + keys.orgKeys?.[orgId as OrganizationId] ?? keys.userKey, ); } }),