1 files changed, 6 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index 1254f8e110a..3ccc44fe60b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -135,8 +135,12 @@ public class Content extends ConfigModel {
 
     public static List<SearchCluster> getSearchClusters(ConfigModelRepo pc) {
         List<SearchCluster> clusters = new ArrayList<>();
-        for (ContentCluster c : getContentClusters(pc))
-            clusters.addAll(c.getSearch().getClusters().values());
+        for (ContentCluster c : getContentClusters(pc)) {
+            SearchCluster sc = c.getSearch().getSearchCluster();
+            if (sc != null) {
+                clusters.add(sc);
+            }
+        }
         return clusters;
     }