1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 1e4a3b1e003..f55d179b184 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -89,7 +89,7 @@ public class ClusterControllerContainer extends Container implements
     }
 
     private void configureZooKeeperServer(boolean runStandaloneZooKeeper, boolean reconfigurable) {
-        if (reconfigurable) {
+        if (reconfigurable && runStandaloneZooKeeper) {
             ContainerModelBuilder.addReconfigurableZooKeeperServerComponents(this);
         } else {
             addComponent("clustercontroller-zookeeper-server",