diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
index ce6a2dc8ebe46..2294ba6f9a2b5 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
@@ -107,7 +107,7 @@ class DateHistogramAggregator extends BucketsAggregator implements SizedBucketAg
     private boolean starTreeDateRoundingRequired = true;
 
     private final FilterRewriteOptimizationContext filterRewriteOptimizationContext;
-    public final String STARTREE_TIMESTAMP_FIELD = "@timestamp";
+    public final String fieldName;
 
     DateHistogramAggregator(
         String name,
@@ -172,6 +172,9 @@ protected Function<Long, Long> bucketOrdProducer() {
             }
         };
         filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, subAggregators.length, context);
+        this.fieldName = (valuesSource instanceof ValuesSource.Numeric.FieldData)
+            ? ((ValuesSource.Numeric.FieldData) valuesSource).getIndexFieldName()
+            : null;
         this.starTreeDateDimension = (context.getQueryShardContext().getStarTreeQueryContext() != null)
             ? fetchStarTreeCalendarUnit()
             : null;
@@ -244,13 +247,13 @@ private String fetchStarTreeCalendarUnit() {
             .next();
         DateDimension starTreeDateDimension = (DateDimension) compositeMappedFieldType.getDimensions()
             .stream()
-            .filter(dim -> dim.getField().equals(STARTREE_TIMESTAMP_FIELD))
+            .filter(dim -> dim.getField().equals(fieldName))
             .findFirst() // Get the first matching time dimension
-            .orElseThrow(() -> new AssertionError(String.format(Locale.ROOT, "Date dimension '%s' not found", STARTREE_TIMESTAMP_FIELD)));
+            .orElseThrow(() -> new AssertionError(String.format(Locale.ROOT, "Date dimension '%s' not found", fieldName)));
 
         DateTimeUnitAdapter dateTimeUnitRounding = new DateTimeUnitAdapter(this.rounding.unit());
         DateTimeUnitRounding rounding = starTreeDateDimension.findClosestValidInterval(dateTimeUnitRounding);
-        String dimensionName = STARTREE_TIMESTAMP_FIELD + "_" + rounding.shortName();
+        String dimensionName = fieldName + "_" + rounding.shortName();
         if (rounding.shortName().equals(this.rounding.unit().shortName())) {
             this.starTreeDateRoundingRequired = false;
         }