diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
index 46c1de82b9d..30b4c55a3d5 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
@@ -181,7 +181,11 @@ public class AllFieldMapper extends AbstractFieldMapper<Void> implements Interna
         if (analyzer == null) {
             analyzer = context.analyzer();
             if (analyzer == null) {
-                analyzer = Lucene.STANDARD_ANALYZER;
+                analyzer = context.docMapper().indexAnalyzer();
+                if (analyzer == null) {
+                    // This should not happen, should we log warn it?
+                    analyzer = Lucene.STANDARD_ANALYZER;
+                }
             }
         }
         return analyzer;