diff --git a/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php b/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php
index 21bb3ed7c..ef8954843 100644
--- a/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php
+++ b/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php
@@ -100,8 +100,8 @@ public function create(ContainerConfigurationInterface $containerConfig, $queryT
             $relevanceConfig = $containerConfig->getRelevanceConfig();
             if ($relevanceConfig->getSpanMatchBoost()) {
                 $spanQuery = $this->getSpanQuery($containerConfig, $queryText, $relevanceConfig->getSpanMatchBoost());
-                $spanQuery->setName('SPAN');
                 if ($spanQuery !== null) {
+                    $spanQuery->setName('SPAN');
                     $queryParams = [
                         'must'      => [$query],
                         'should'    => [$spanQuery],