diff --git a/src/Api/Vault/Validators/CipherRotationValidator.cs b/src/Api/Vault/Validators/CipherRotationValidator.cs index d6c12b96e9..836fe6fe1a 100644 --- a/src/Api/Vault/Validators/CipherRotationValidator.cs +++ b/src/Api/Vault/Validators/CipherRotationValidator.cs @@ -28,12 +28,18 @@ public class CipherRotationValidator : IRotationValidator(); var existingCiphers = await _cipherRepository.GetManyByUserIdAsync(user.Id, UseFlexibleCollections); - if (existingCiphers == null || existingCiphers.Count == 0) + if (existingCiphers == null) { return result; } - foreach (var existing in existingCiphers) + var existingUserCiphers = existingCiphers.Where(c => c.OrganizationId == null); + if (existingUserCiphers.Count() == 0) + { + return result; + } + + foreach (var existing in existingUserCiphers) { var cipher = ciphers.FirstOrDefault(c => c.Id == existing.Id); if (cipher == null)