diff --git a/src/Core/Repositories/SqlServer/CollectionRepository.cs b/src/Core/Repositories/SqlServer/CollectionRepository.cs
index e774dbaec1..c80c191db0 100644
--- a/src/Core/Repositories/SqlServer/CollectionRepository.cs
+++ b/src/Core/Repositories/SqlServer/CollectionRepository.cs
@@ -107,7 +107,21 @@ namespace Bit.Core.Repositories.SqlServer
                 // Return distinct Id results.
                 return results
                     .GroupBy(c => c.Id)
-                    .Select(c => c.First())
+                    .Select(grouping =>
+                    { 
+                        var first = grouping.First();
+                        if (first.HidePasswords)
+                        {
+                            first.HidePasswords = !grouping.Any(c => !c.HidePasswords);
+                        }
+
+                        if (first.ReadOnly)
+                        {
+                            first.ReadOnly = !grouping.Any(c => !c.ReadOnly);
+                        }
+                        
+                        return first;
+                    })
                     .ToList();
             }
         }