diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
index cb1146b73e5..dbbfe4726a7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
@@ -240,7 +240,11 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
             if (timeout.isCancelled()) {
                 return;
             }
-            listener.onTimeout(this.timeout);
+            if (lifecycle.stoppedOrClosed()) {
+                listener.onClose();
+            } else {
+                listener.onTimeout(this.timeout);
+            }
             // note, we rely on the listener to remove itself in case of timeout if needed
         }
     }