diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index 755e69264d9e..ce5b07b1c0a8 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -186,13 +186,13 @@ where cg.CollectionId.Equals(id)
         {
             var dbContext = GetDatabaseContext(scope);
             var groups =
-                from cg in dbContext.CollectionGroups
-                where cg.Collection.OrganizationId == organizationId
+                from c in collections
+                join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
                 group cg by cg.CollectionId into g
                 select g;
             var users =
-                from cu in dbContext.CollectionUsers
-                where cu.Collection.OrganizationId == organizationId
+                from c in collections
+                join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
                 group cu by cu.CollectionId into u
                 select u;
 
@@ -230,19 +230,16 @@ group cu by cu.CollectionId into u
         {
             var dbContext = GetDatabaseContext(scope);
             var groups =
-                from cg in dbContext.CollectionGroups
-                where cg.Collection.OrganizationId == organizationId
-                 && collections.Select(c => c.Id).Contains(cg.Collection.Id)
+                from c in collections
+                join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
                 group cg by cg.CollectionId into g
                 select g;
             var users =
-                from cu in dbContext.CollectionUsers
-                where cu.Collection.OrganizationId == organizationId
-                 && collections.Select(c => c.Id).Contains(cu.Collection.Id)
+                from c in collections
+                join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
                 group cu by cu.CollectionId into u
                 select u;
 
-
             return collections.Select(collection =>
                 new Tuple<Core.Entities.Collection, CollectionAccessDetails>(
                     collection,