diff --git a/lib/RoadizCoreBundle/src/SearchEngine/AbstractSearchHandler.php b/lib/RoadizCoreBundle/src/SearchEngine/AbstractSearchHandler.php
index 8175a7fb..b81fa233 100644
--- a/lib/RoadizCoreBundle/src/SearchEngine/AbstractSearchHandler.php
+++ b/lib/RoadizCoreBundle/src/SearchEngine/AbstractSearchHandler.php
@@ -67,6 +67,11 @@ public function searchWithHighlight(
         $args["fq"][] = "document_type_s:" . $this->getDocumentType();
         $args = array_merge($this->getHighlightingOptions($args), $args);
         $response = $this->nativeSearch($q, $args, $rows, $searchTags, $proximity, $page);
+        return $this->createSearchResultsFromResponse($response);
+    }
+
+    protected function createSearchResultsFromResponse(?array $response): SolrSearchResults
+    {
         return new SolrSearchResults(null !== $response ? $response : [], $this->em);
     }
 
@@ -204,7 +209,7 @@ public function search(
         $args = array_merge($tmp, $args);
 
         $response = $this->nativeSearch($q, $args, $rows, $searchTags, $proximity, $page);
-        return new SolrSearchResults(null !== $response ? $response : [], $this->em);
+        return $this->createSearchResultsFromResponse($response);
     }
 
     /**