1 files changed, 3 insertions, 17 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 7c48ec11729..791faa401ed 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -209,20 +209,10 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem
                 docprocChain = docprocChain.trim();
             }
             if (docprocCluster != null && !docprocCluster.isEmpty()) {
-                if (!c.getSearch().hasIndexedCluster() && c.getSearch().getIndexingDocproc().isEmpty() &&
-                        docprocChain != null && !docprocChain.isEmpty()) {
-                    c.getSearch().setupStreamingSearchIndexingDocProc();
-                }
-                var indexingDocproc = c.getSearch().getIndexingDocproc();
-                if (indexingDocproc.isPresent()) {
-                    indexingDocproc.get().setClusterName(docprocCluster);
-                }
+                c.getSearch().getIndexingDocproc().setClusterName(docprocCluster);
             }
             if (docprocChain != null && !docprocChain.isEmpty()) {
-                var indexingDocproc = c.getSearch().getIndexingDocproc();
-                if (indexingDocproc.isPresent()) {
-                    indexingDocproc.get().setChainName(docprocChain);
-                }
+                c.getSearch().getIndexingDocproc().setChainName(docprocChain);
             }
         }
 
@@ -301,10 +291,7 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem
                     Objects.requireNonNull(admin.getLogserver(), "logserver cannot be null");
                     List<HostResource> host = List.of(admin.getLogserver().getHostResource());
                     admin.setClusterControllers(createClusterControllers(new ClusterControllerCluster(admin, "standalone", deployState),
-                                                                         host,
-                                                                         clusterName,
-                                                                         true,
-                                                                         deployState),
+                                                                         host, clusterName, true, deployState),
                                                 deployState);
                 }
                 clusterControllers = admin.getClusterControllers();
@@ -457,7 +444,6 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem
 
     @Override
     public void getConfig(MessagetyperouteselectorpolicyConfig.Builder builder) {
-        if (getSearch().getIndexingDocproc().isEmpty()) return;
         DocumentProtocol.getConfig(builder, getConfigId());
     }