diff --git a/src/Core/Services/Implementations/CollectionService.cs b/src/Core/Services/Implementations/CollectionService.cs
index 92269d84f7..ff5016d0ed 100644
--- a/src/Core/Services/Implementations/CollectionService.cs
+++ b/src/Core/Services/Implementations/CollectionService.cs
@@ -61,13 +61,13 @@ namespace Bit.Core.Services
             }
             else
             {
-                if(groups == null || !org.UseGroups)
+                if(!org.UseGroups)
                 {
                     await _collectionRepository.ReplaceAsync(collection);
                 }
                 else
                 {
-                    await _collectionRepository.ReplaceAsync(collection, groups);
+                    await _collectionRepository.ReplaceAsync(collection, groups ?? new List<SelectionReadOnly>());
                 }
             }
         }
diff --git a/src/Core/Services/Implementations/GroupService.cs b/src/Core/Services/Implementations/GroupService.cs
index 70ab256f6c..0790677449 100644
--- a/src/Core/Services/Implementations/GroupService.cs
+++ b/src/Core/Services/Implementations/GroupService.cs
@@ -50,15 +50,7 @@ namespace Bit.Core.Services
             else
             {
                 group.RevisionDate = DateTime.UtcNow;
-
-                if(collections == null)
-                {
-                    await _groupRepository.ReplaceAsync(group);
-                }
-                else
-                {
-                    await _groupRepository.ReplaceAsync(group, collections);
-                }
+                await _groupRepository.ReplaceAsync(group, collections ?? new List<SelectionReadOnly>());
             }
         }
     }