diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java
index 415ff8f5510..d42a46b12f0 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/TextQueryParser.java
@@ -130,6 +130,9 @@ public class TextQueryParser {
             if (mapper != null) {
                 analyzer = mapper.searchAnalyzer();
             }
+            if (analyzer == null && smartNameFieldMappers != null && smartNameFieldMappers.docMapper() != null) {
+                analyzer = smartNameFieldMappers.docMapper().searchAnalyzer();
+            }
             if (analyzer == null) {
                 analyzer = parseContext.mapperService().searchAnalyzer();
             }