diff --git a/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java
index e1019ba80596b..a72b4c833bf6e 100644
--- a/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java
+++ b/server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java
@@ -564,7 +564,7 @@ private Query getPrefixQuerySingle(String field, String termStr) throws ParseExc
             if (currentFieldType == null || currentFieldType.getTextSearchInfo() == TextSearchInfo.NONE) {
                 return newUnmappedFieldQuery(field);
             }
-            setAnalyzer(forceAnalyzer == null ? queryBuilder.context.getSearchAnalyzer(currentFieldType) : forceAnalyzer);
+            setAnalyzer(getSearchAnalyzer(currentFieldType));
             Query query = null;
             if (currentFieldType.getTextSearchInfo().isTokenized() == false) {
                 query = currentFieldType.prefixQuery(termStr, getMultiTermRewriteMethod(), context);
@@ -786,7 +786,6 @@ private Query getRegexpQuerySingle(String field, String termStr) throws ParseExc
             }
             setAnalyzer(getSearchAnalyzer(currentFieldType));
             return super.getRegexpQuery(field, termStr);
-
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);