diff --git a/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Spellchecker.php b/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Spellchecker.php
index 0f6c4f86a..3834a7f03 100644
--- a/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Spellchecker.php
+++ b/src/module-elasticsuite-core/Search/Adapter/Elasticsuite/Spellchecker.php
@@ -163,6 +163,7 @@ private function getTermVectors(RequestInterface $request)
                 MappingInterface::DEFAULT_SPELLING_FIELD => $request->getQueryText(),
             ],
         ];
+        $perFieldAnalyzer = [];
 
         if ($request->isUsingReference()) {
             $doc['fields'][] = MappingInterface::DEFAULT_REFERENCE_FIELD . "." . FieldInterface::ANALYZER_REFERENCE;
@@ -171,9 +172,15 @@ private function getTermVectors(RequestInterface $request)
 
         if ($request->isUsingEdgeNgram()) {
             $doc['fields'][] = MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM;
+            $perFieldAnalyzer[MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM]
+                = FieldInterface::ANALYZER_STANDARD;
             $doc['doc'][MappingInterface::DEFAULT_EDGE_NGRAM_FIELD] = $request->getQueryText();
         }
 
+        if (!empty($perFieldAnalyzer)) {
+            $doc['per_field_analyzer'] = $perFieldAnalyzer;
+        }
+
         $docs = [];
 
         // Compute the mtermvector query on all indices.
diff --git a/src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/SpellcheckerTest.php b/src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/SpellcheckerTest.php
index 7b22c8baa..a835dfd4f 100644
--- a/src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/SpellcheckerTest.php
+++ b/src/module-elasticsuite-core/Test/Unit/Search/Adapter/Elasticsuite/SpellcheckerTest.php
@@ -181,6 +181,10 @@ public function testEdgeNgramTermVectorsParams()
                             MappingInterface::DEFAULT_SEARCH_FIELD . "." . FieldInterface::ANALYZER_WHITESPACE,
                             MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM,
                         ],
+                        'per_field_analyzer' => [
+                            MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM
+                                => FieldInterface::ANALYZER_STANDARD,
+                        ],
                         'doc'             => [
                             MappingInterface::DEFAULT_SEARCH_FIELD   => $queryText,
                             MappingInterface::DEFAULT_SPELLING_FIELD => $queryText,
@@ -239,6 +243,10 @@ public function testReferenceAndEdgeNgramTermVectorsParams()
                             MappingInterface::DEFAULT_REFERENCE_FIELD . "." . FieldInterface::ANALYZER_REFERENCE,
                             MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM,
                         ],
+                        'per_field_analyzer' => [
+                            MappingInterface::DEFAULT_EDGE_NGRAM_FIELD . "." . FieldInterface::ANALYZER_EDGE_NGRAM
+                            => FieldInterface::ANALYZER_STANDARD,
+                        ],
                         'doc'             => [
                             MappingInterface::DEFAULT_SEARCH_FIELD   => $queryText,
                             MappingInterface::DEFAULT_SPELLING_FIELD => $queryText,