diff --git a/client/internal/conn_mgr.go b/client/internal/conn_mgr.go
index ed6fbf01b..aae6153bc 100644
--- a/client/internal/conn_mgr.go
+++ b/client/internal/conn_mgr.go
@@ -122,14 +122,16 @@ func (e *ConnMgr) Close() {
 	}
 	// todo wait for receiveLazyConnEvents to finish
 	e.lazyConnMgr.Close()
+	e.lazyConnMgr = nil
 }
 
 func (e *ConnMgr) receiveLazyConnEvents(ctx context.Context) {
 	for {
 		select {
+		case <-ctx.Done():
+			return
 		case peerID := <-e.lazyConnMgr.PeerActivityChan:
 			e.peerStore.PeerConnOpen(peerID)
-		case <-ctx.Done():
 		}
 	}
 }