diff --git a/internal/xds/balancer/cdsbalancer/cdsbalancer.go b/internal/xds/balancer/cdsbalancer/cdsbalancer.go
index 7e81139b093c..c00a81b98269 100644
--- a/internal/xds/balancer/cdsbalancer/cdsbalancer.go
+++ b/internal/xds/balancer/cdsbalancer/cdsbalancer.go
@@ -106,11 +106,12 @@ func (bb) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Bal
 		xdsHIPtr:          &xdsHIPtr,
 		watchers:          make(map[string]*watcherState),
 	}
+	b.logger = prefixLogger(b)
 	b.ccw = &ccWrapper{
 		ClientConn: cc,
 		xdsHIPtr:   b.xdsHIPtr,
+		logger:     b.logger,
 	}
-	b.logger = prefixLogger(b)
 	b.logger.Infof("Created")
 
 	var creds credentials.TransportCredentials
@@ -681,6 +682,7 @@ type ccWrapper struct {
 	balancer.ClientConn
 
 	xdsHIPtr *unsafe.Pointer
+	logger   *grpclog.PrefixLogger
 }
 
 // NewSubConn intercepts NewSubConn() calls from the child policy and adds an
@@ -697,12 +699,8 @@ func (ccw *ccWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubC
 	return ccw.ClientConn.NewSubConn(newAddrs, opts)
 }
 
-func (ccw *ccWrapper) UpdateAddresses(sc balancer.SubConn, addrs []resolver.Address) {
-	newAddrs := make([]resolver.Address, len(addrs))
-	for i, addr := range addrs {
-		newAddrs[i] = xdsinternal.SetHandshakeInfo(addr, ccw.xdsHIPtr)
-	}
-	ccw.ClientConn.UpdateAddresses(sc, newAddrs)
+func (ccw *ccWrapper) UpdateAddresses(sc balancer.SubConn, _ []resolver.Address) {
+	ccw.logger.Errorf("UpdateAddresses(%v) called unexpectedly", sc)
 }
 
 // systemRootCertsProvider implements a certprovider.Provider that returns the