1 files changed, 8 insertions, 5 deletions
diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
index 1aa85ef685..6a36ff7a53 100644
--- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
+++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
@@ -50,11 +50,14 @@ final class CountMethodValueSource extends ValueSource {
         final SortedNumericDoubleValues values = leafData.getDoubleValues();
 
         return new DoubleDocValues(this) {
-          @Override
-          public double doubleVal(int doc) {
-            values.setDocument(doc);
-            return values.count();
-          }
+            @Override
+            public double doubleVal(int doc) throws IOException {
+                if (values.advanceExact(doc)) {
+                    return values.docValueCount();
+                } else {
+                    return 0;
+                }
+            }
         };
     }