1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
index cef7f37328..8ef4d0b7e2 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
@@ -82,10 +82,12 @@ public class MaxAggregator extends NumericMetricsAggregator.SingleValue {
                     maxes = bigArrays.grow(maxes, bucket + 1);
                     maxes.fill(from, maxes.size(), Double.NEGATIVE_INFINITY);
                 }
-                final double value = values.get(doc);
-                double max = maxes.get(bucket);
-                max = Math.max(max, value);
-                maxes.set(bucket, max);
+                if (values.advanceExact(doc)) {
+                    final double value = values.doubleValue();
+                    double max = maxes.get(bucket);
+                    max = Math.max(max, value);
+                    maxes.set(bucket, max);
+                }
             }
 
         };