diff --git a/internal/stubserver/stubserver.go b/internal/stubserver/stubserver.go
index 9234fc283..73c12aed8 100644
--- a/internal/stubserver/stubserver.go
+++ b/internal/stubserver/stubserver.go
@@ -133,6 +133,7 @@ func (ss *StubServer) StartClient(dopts ...grpc.DialOption) error {
 		ss.R.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: ss.Address}}})
 	}
 	if err := waitForReady(cc); err != nil {
+		cc.Close()
 		return err
 	}