diff --git a/src/FilterLists.Services/Snapshot/BatchSizeService.cs b/src/FilterLists.Services/Snapshot/BatchSizeService.cs
index 985e44a39..6aa5b4bb2 100644
--- a/src/FilterLists.Services/Snapshot/BatchSizeService.cs
+++ b/src/FilterLists.Services/Snapshot/BatchSizeService.cs
@@ -20,9 +20,11 @@ public async Task<int> GetBatchSize()
         {
             var recentSnapPerfs = await GetRecentSnapPerfs();
             return recentSnapPerfs.Count == 2
-                ? (recentSnapPerfs[0].RulesPerMs >= recentSnapPerfs[1].RulesPerMs
-                    ? (int)Math.Round(recentSnapPerfs[0].BatchSize * (1 + PercentMultiplier))
-                    : (int)Math.Round(recentSnapPerfs[0].BatchSize * (1 - PercentMultiplier)))
+                ? recentSnapPerfs[0].RulesCount > recentSnapPerfs[0].BatchSize
+                    ? (recentSnapPerfs[0].RulesPerMs >= recentSnapPerfs[1].RulesPerMs
+                        ? (int)Math.Round(recentSnapPerfs[0].BatchSize * (1 + PercentMultiplier))
+                        : (int)Math.Round(recentSnapPerfs[0].BatchSize * (1 - PercentMultiplier)))
+                    : recentSnapPerfs[0].BatchSize
                 : DefaultBatchSize;
         }
 
@@ -43,7 +45,7 @@ await DbContext.Snapshots
         private class SnapshotPerformance
         {
             public int BatchSize { get; set; }
-            public int RulesCount { private get; set; }
+            public int RulesCount { get; set; }
             public DateTime CreatedDateUtc { private get; set; }
             public DateTime ModifiedDateUtc { private get; set; }
             public int RulesPerMs => (ModifiedDateUtc - CreatedDateUtc).Milliseconds / RulesCount;