diff --git a/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java b/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java
index 3f9209d347..1eaef890b5 100644
--- a/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java
+++ b/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java
@@ -254,7 +254,8 @@ final class ClusterResolverLoadBalancer extends LoadBalancer {
     private void handleEndpointResolutionError() {
       boolean allInError = true;
       Status error = null;
-      for (ClusterState state :  clusterStates.values()) {
+      for (String cluster : clusters) {
+        ClusterState state = clusterStates.get(cluster);
         if (state.status.isOk()) {
           allInError = false;
         } else {