diff --git a/src/module-elasticsuite-core/Index/Mapping/Field.php b/src/module-elasticsuite-core/Index/Mapping/Field.php
index 9a817f1e1..170733011 100644
--- a/src/module-elasticsuite-core/Index/Mapping/Field.php
+++ b/src/module-elasticsuite-core/Index/Mapping/Field.php
@@ -411,6 +411,9 @@ private function getPropertyConfig($analyzer = self::ANALYZER_UNTOUCHED): array
                 }
                 if ($analyzer !== self::ANALYZER_UNTOUCHED) {
                     $fieldMapping['analyzer'] = $analyzer;
+                    if ($analyzer === self::ANALYZER_EDGE_NGRAM) {
+                        $fieldMapping['search_analyzer'] = self::ANALYZER_STANDARD;
+                    }
 
                     if ($this->normsDisabled() || ($analyzer === self::ANALYZER_KEYWORD)) {
                         $fieldMapping['norms'] = false;