1 files changed, 6 insertions, 2 deletions
diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
index 3ac885e49d..f2aaced376 100644
--- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
+++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
@@ -71,8 +71,12 @@ class FieldDataValueSource extends ValueSource {
         NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues(), 0d);
         return new DoubleDocValues(this) {
           @Override
-          public double doubleVal(int doc) {
-            return docValues.get(doc);
+          public double doubleVal(int doc) throws IOException {
+            if (docValues.advanceExact(doc)) {
+                return docValues.doubleValue();
+            } else {
+                return 0;
+            }
           }
         };
     }