1 files changed, 11 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
index 9a98958fca9..3f336544a99 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
@@ -131,10 +131,18 @@ public class IndexingValidation extends Processor {
             } else if (exp instanceof SummaryExpression) {
                 SummaryField field = schema.getSummaryField(fieldName);
                 if (field == null) {
-                    throw new VerificationException(exp, "Summary field '" + fieldName + "' not found.");
+                    // Use document field if summary field is not found
+                    SDField sdField = schema.getConcreteField(fieldName);
+                    if (sdField != null && sdField.doesSummarying()) {
+                        fieldDesc = "document field";
+                        fieldType = sdField.getDataType();
+                    } else {
+                        throw new VerificationException(exp, "Summary field '" + fieldName + "' not found.");
+                    }
+                } else {
+                    fieldDesc = "summary field";
+                    fieldType = field.getDataType();
                 }
-                fieldDesc = "summary field";
-                fieldType = field.getDataType();
             } else {
                 throw new UnsupportedOperationException();
             }