diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/FastFilterRewriteHelper.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/FastFilterRewriteHelper.java
index 083e4702e02f0..1d1e7a5fe7862 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/FastFilterRewriteHelper.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/FastFilterRewriteHelper.java
@@ -140,6 +140,7 @@ private static Weight[] createFilterForAggregations(
         int bucketCount = 0;
         while (roundedLow <= fieldType.convertNanosToMillis(high)) {
             bucketCount++;
+            if (bucketCount > MAX_NUM_FILTER_BUCKETS) return null;
             // Below rounding is needed as the interval could return in
             // non-rounded values for something like calendar month
             roundedLow = preparedRounding.round(roundedLow + interval);
@@ -148,7 +149,7 @@ private static Weight[] createFilterForAggregations(
         }
 
         Weight[] filters = null;
-        if (bucketCount > 0 && bucketCount <= MAX_NUM_FILTER_BUCKETS) {
+        if (bucketCount > 0) {
             filters = new Weight[bucketCount];
             roundedLow = preparedRounding.round(fieldType.convertNanosToMillis(low));