diff --git a/src/Core/Services/AzureDirectoryService.cs b/src/Core/Services/AzureDirectoryService.cs
index a36ee457..cf80a05a 100644
--- a/src/Core/Services/AzureDirectoryService.cs
+++ b/src/Core/Services/AzureDirectoryService.cs
@@ -50,18 +50,18 @@ namespace Bit.Core.Services
                 throw new ApplicationException("No configuration for sync.");
             }
 
-            List<GroupEntry> groups = null;
-            if(SettingsService.Instance.Sync.SyncGroups)
-            {
-                groups = await GetGroupsAsync(force);
-            }
-
             List<UserEntry> users = null;
             if(SettingsService.Instance.Sync.SyncUsers)
             {
                 users = await GetUsersAsync(force);
             }
 
+            List<GroupEntry> groups = null;
+            if(SettingsService.Instance.Sync.SyncGroups)
+            {
+                groups = await GetGroupsAsync(force || users.Any(u => !u.Deleted && !u.Disabled));
+            }
+
             return new Tuple<List<GroupEntry>, List<UserEntry>>(groups, users);
         }