diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
index 2e14b5d0dc9..4ada976fa43 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
@@ -577,7 +577,7 @@ private static Dictionary<string, object> CreateElasticDocument(DocumentIndex do
 
         public string GetFullIndexName(string indexName)
         {
-            ArgumentException.ThrowIfNullOrEmpty(indexName, nameof(indexName));
+            ArgumentException.ThrowIfNullOrEmpty(indexName);
 
             return GetIndexPrefix() + _separator + indexName;
         }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
index 73be897aab7..8ca429e6780 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
@@ -5,29 +5,30 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Nest;
-using OrchardCore.Environment.Shell;
 
 namespace OrchardCore.Search.Elasticsearch.Core.Services
 {
     public class ElasticQueryService : IElasticQueryService
     {
-        private readonly string _indexPrefix;
         private readonly IElasticClient _elasticClient;
+        private readonly ElasticIndexManager _elasticIndexManager;
         private readonly ILogger _logger;
 
         public ElasticQueryService(
             IElasticClient elasticClient,
-            ShellSettings shellSettings,
+            ElasticIndexManager elasticIndexManager,
             ILogger<ElasticQueryService> logger
             )
         {
-            _indexPrefix = shellSettings.Name.ToLowerInvariant() + "_";
             _elasticClient = elasticClient;
+            _elasticIndexManager = elasticIndexManager;
             _logger = logger;
         }
 
         public async Task<ElasticTopDocs> SearchAsync(string indexName, string query)
         {
+            ArgumentException.ThrowIfNullOrEmpty(indexName);
+
             var elasticTopDocs = new ElasticTopDocs();
 
             if (_elasticClient == null)
@@ -42,7 +43,7 @@ public async Task<ElasticTopDocs> SearchAsync(string indexName, string query)
                 using var stream = new MemoryStream(Encoding.UTF8.GetBytes(query));
                 var deserializedSearchRequest = _elasticClient.RequestResponseSerializer.Deserialize<SearchRequest>(stream);
 
-                var searchRequest = new SearchRequest(_indexPrefix + indexName)
+                var searchRequest = new SearchRequest(_elasticIndexManager.GetFullIndexName(indexName))
                 {
                     Query = deserializedSearchRequest.Query,
                     From = deserializedSearchRequest.From,