1 files changed, 8 insertions, 3 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java
index 8183d5e1960..97c4fdda0f3 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java
@@ -14,6 +14,7 @@ import com.yahoo.vespa.service.monitor.ServiceMonitor;
 import com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager;
 import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -46,9 +47,13 @@ public class ServiceMonitorImpl implements ServiceMonitor {
     }
 
     private List<String> toConfigServerList(ConfigserverConfig configserverConfig) {
-        return configserverConfig.zookeeperserver().stream()
-                .map(ConfigserverConfig.Zookeeperserver::hostname)
-                .collect(Collectors.toList());
+        if (configserverConfig.multitenant()) {
+            return configserverConfig.zookeeperserver().stream()
+                    .map(ConfigserverConfig.Zookeeperserver::hostname)
+                    .collect(Collectors.toList());
+        }
+
+        return Collections.emptyList();
     }
 
     @Override