diff --git a/muted-tests.yml b/muted-tests.yml
index d7b4c472273a6..c2baa1e29a749 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -226,9 +226,6 @@ tests:
 - class: org.elasticsearch.search.functionscore.QueryRescorerIT
   method: testScoring
   issue: https://github.com/elastic/elasticsearch/issues/116050
-- class: org.elasticsearch.indexing.IndexActionIT
-  method: testAutoGenerateIdNoDuplicates
-  issue: https://github.com/elastic/elasticsearch/issues/115716
 - class: org.elasticsearch.xpack.application.connector.ConnectorIndexServiceTests
   issue: https://github.com/elastic/elasticsearch/issues/116087
 - class: org.elasticsearch.compute.operator.FilterOperatorTests
diff --git a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
index 6c654d9235ec2..249f49c951fcd 100644
--- a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
+++ b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
@@ -480,7 +480,7 @@ protected void doRun() {
                             onMergeFailure(t);
                             return;
                         }
-                        synchronized (QueryPhaseResultConsumer.this) {
+                        synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
                             if (hasFailure()) {
                                 return;
                             }
@@ -501,7 +501,7 @@ protected void doRun() {
                             }
                         }
                         Runnable r = mergeTask.consumeListener();
-                        synchronized (QueryPhaseResultConsumer.this) {
+                        synchronized (QueryPhaseResultConsumer.PendingMerges.this) {
                             while (true) {
                                 mergeTask = queue.poll();
                                 runningTask.set(mergeTask);