1 files changed, 8 insertions, 13 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
index a25cc30955e..96bf40195e9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
@@ -3,7 +3,6 @@ package com.yahoo.prelude.searcher;
 
 import com.yahoo.component.chain.dependencies.After;
 import com.yahoo.component.chain.dependencies.Before;
-import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -32,14 +31,12 @@ public class ValidateSortingSearcher extends Searcher {
 
     private Map<String, AttributesConfig.Attribute> attributeNames = null;
     private String clusterName = "";
-    private final QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode;
+    private final boolean enabled;
 
-    public ValidateSortingSearcher(QrSearchersConfig qrsConfig, ClusterConfig clusterConfig,
-                                   AttributesConfig attributesConfig) {
+    public ValidateSortingSearcher(ClusterConfig clusterConfig, AttributesConfig attributesConfig) {
         initAttributeNames(attributesConfig);
-        var searchCluster = qrsConfig.searchcluster(clusterConfig.clusterId());
-        setClusterName(searchCluster.name());
-        indexingMode = searchCluster.indexingmode();
+        setClusterName(clusterConfig.clusterName());
+        enabled = clusterConfig.indexMode() != ClusterConfig.IndexMode.Enum.STREAMING;
     }
 
     public String getClusterName() {
@@ -70,12 +67,10 @@ public class ValidateSortingSearcher extends Searcher {
     @Override
     public Result search(Query query, Execution execution) {
         ErrorMessage e = validate(query);
-        if (indexingMode != QrSearchersConfig.Searchcluster.Indexingmode.STREAMING) {
-            if (e != null) {
-                Result r = new Result(query);
-                r.hits().addError(e);
-                return r;
-            }
+        if (enabled && e != null) {
+            Result r = new Result(query);
+            r.hits().addError(e);
+            return r;
         }
         return execution.search(query);
     }