1 files changed, 5 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
index 3cd296c1469..7bdd2ce51a4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
@@ -49,16 +49,19 @@ class SearchHandler extends ProcessingHandler<SearchChains> {
 
     private static class Threadpool extends ContainerThreadpool {
 
+        private final int threads;
+
         Threadpool(DeployState ds, Element options) {
             super(ds, "search-handler", options);
+            threads = ds.featureFlags().searchHandlerThreadpool();
         }
 
         @Override
         public void setDefaultConfigValues(ContainerThreadpoolConfig.Builder builder) {
             builder.maxThreadExecutionTimeSeconds(190)
                     .keepAliveTime(5.0)
-                    .maxThreads(-2)
-                    .minThreads(-2)
+                    .maxThreads(-threads)
+                    .minThreads(-threads)
                     .queueSize(-40);
         }