diff --git a/xds/src/main/java/io/grpc/xds/EdsLoadBalancer.java b/xds/src/main/java/io/grpc/xds/EdsLoadBalancer.java
index 640a12dc4b..30963c1eb3 100644
--- a/xds/src/main/java/io/grpc/xds/EdsLoadBalancer.java
+++ b/xds/src/main/java/io/grpc/xds/EdsLoadBalancer.java
@@ -69,9 +69,6 @@ final class EdsLoadBalancer extends LoadBalancer {
   // Most recent XdsConfig.
   @Nullable
   private XdsConfig xdsConfig;
-  // Most recent EndpointWatcher.
-  @Nullable
-  private EndpointWatcher endpointWatcher;
   @Nullable
   private ObjectPool<XdsClient> xdsClientPool;
   @Nullable
@@ -214,11 +211,7 @@ final class EdsLoadBalancer extends LoadBalancer {
           new ClusterEndpointsBalancerFactory(clusterServiceName);
       switchingLoadBalancer.switchTo(clusterEndpointsLoadBalancerFactory);
     }
-    resolvedAddresses = resolvedAddresses.toBuilder()
-        .setLoadBalancingPolicyConfig(newXdsConfig)
-        .build();
     switchingLoadBalancer.handleResolvedAddresses(resolvedAddresses);
-
     this.xdsConfig = newXdsConfig;
   }
 
@@ -263,16 +256,9 @@ final class EdsLoadBalancer extends LoadBalancer {
    */
   private final class ClusterEndpointsBalancerFactory extends LoadBalancer.Factory {
     final String clusterServiceName;
-    @Nullable
-    final String oldClusterServiceName;
 
     ClusterEndpointsBalancerFactory(String clusterServiceName) {
       this.clusterServiceName = clusterServiceName;
-      if (xdsConfig != null) {
-        oldClusterServiceName = xdsConfig.edsServiceName;
-      } else {
-        oldClusterServiceName = null;
-      }
     }
 
     @Override
@@ -314,11 +300,6 @@ final class EdsLoadBalancer extends LoadBalancer {
 
         endpointWatcher = new EndpointWatcherImpl(localityStore);
         xdsClient.watchEndpointData(clusterServiceName, endpointWatcher);
-        if (EdsLoadBalancer.this.endpointWatcher != null) {
-          xdsClient.cancelEndpointDataWatch(
-              oldClusterServiceName, EdsLoadBalancer.this.endpointWatcher);
-        }
-        EdsLoadBalancer.this.endpointWatcher = endpointWatcher;
       }
 
       // TODO(zddapeng): In handleResolvedAddresses() handle child policy change if any.