1 files changed, 2 insertions, 2 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlimeClusterStateBundleCodec.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlimeClusterStateBundleCodec.java
index c37bd8313a9..f6034cb34ff 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlimeClusterStateBundleCodec.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlimeClusterStateBundleCodec.java
@@ -48,9 +48,9 @@ public class SlimeClusterStateBundleCodec implements ClusterStateBundleCodec {
         ClusterState baseline = ClusterState.stateFromString(states.field("baseline").asString());
 
         Inspector spaces = states.field("spaces");
-        Map<String, ClusterState> derivedStates = new HashMap<>();
+        Map<String, AnnotatedClusterState> derivedStates = new HashMap<>();
         spaces.traverse(((ObjectTraverser)(key, value) -> {
-            derivedStates.put(key, ClusterState.stateFromString(value.asString()));
+            derivedStates.put(key, AnnotatedClusterState.withoutAnnotations(ClusterState.stateFromString(value.asString())));
         }));
 
         return ClusterStateBundle.of(AnnotatedClusterState.withoutAnnotations(baseline), derivedStates);