diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index b83b6b0deeb2..5fe4be7fbcf9 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -347,11 +347,11 @@ public void handleNewPublishedState(ClusterStateBundle stateBundle) {
         verifyInControllerThread();
         ClusterState baselineState = stateBundle.getBaselineClusterState();
         newStates.add(stateBundle);
+        systemStateBroadcaster.handleNewClusterStates(stateBundle);
         metricUpdater.updateClusterStateMetrics(cluster, baselineState,
                 ResourceUsageStats.calculateFrom(cluster.getNodeInfos(), options.clusterFeedBlockLimit(), stateBundle.getFeedBlock()),
                 systemStateBroadcaster.getLastStateBroadcastTimePoint());
         lastMetricUpdateCycleCount = cycleCount;
-        systemStateBroadcaster.handleNewClusterStates(stateBundle);
         // Iff master, always store new version in ZooKeeper _before_ publishing to any
         // nodes so that a cluster controller crash after publishing but before a successful
         // ZK store will not risk reusing the same version number.