diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.test.ts
index 0ba2882c61..c36d81eb14 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.test.ts
@@ -60,10 +60,11 @@ describe('ElasticSearchSearchEngineIndexer', () => {
       bulkSpy,
     );
     refreshSpy = jest.fn().mockReturnValue({});
+    // Use specific pattern to avoid conflict with /some-type-index__* wildcard mock
     mock.add(
       {
         method: 'GET',
-        path: '/:index/_refresh',
+        path: '/some-type-index__:ts/_refresh',
       },
       refreshSpy,
     );
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
index b57524e13a..484205e138 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngineIndexer.ts
@@ -97,7 +97,8 @@ export class ElasticSearchSearchEngineIndexer extends BatchSearchEngineIndexer {
             : {}),
         };
       },
-      refreshOnCompletion: options.skipRefresh !== true,
+      refreshOnCompletion:
+        options.skipRefresh !== true ? that.indexName : false,
     });
 
     // Safely catch errors thrown by the bulk helper client, e.g. HTTP timeouts