diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
index 0b81cd76dc6cf..16bb99cdbc2df 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
@@ -868,7 +868,11 @@ public SortedMap<String, List<Integer>> getValuesWithOffsets(String field) {
     }
 
     public int getArrayValueCount(String field) {
-        return numValuesByField.getOrDefault(field, 0);
+        if (numValuesByField.containsKey(field)) {
+            return numValuesByField.get(field) + 1;
+        } else {
+            return 0;
+        }
     }
 
     public void recordOffset(String fieldName, String value) {