1 files changed, 5 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
index cbe24eb6907..54d49569ede 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
@@ -82,20 +82,23 @@ public class SearchCluster implements NodeManager<Node> {
                                                                        nodesByHost,
                                                                        groups);
 
-        this.clusterMonitor = new ClusterMonitor<>(this);
+        this.clusterMonitor = new ClusterMonitor<>(this, false);
     }
 
     public void shutDown() {
         clusterMonitor.shutdown();
     }
 
-    public void startClusterMonitoring(PingFactory pingFactory) {
+    public void startClusterMonitoring(PingFactory pingFactory, boolean startPingThread) {
         this.pingFactory = pingFactory;
 
         for (var group : orderedGroups) {
             for (var node : group.nodes())
                 clusterMonitor.add(node, true);
         }
+        if (startPingThread) {
+            clusterMonitor.start();
+        }
     }
 
     ClusterMonitor<Node> clusterMonitor() { return clusterMonitor; }