diff --git a/peer.go b/peer.go
index d83f7c37..e4790f00 100644
--- a/peer.go
+++ b/peer.go
@@ -645,8 +645,10 @@ out:
 
 	p.Disconnect(errors.New("read handler closed"))
 
-	for _, chanStream := range chanMsgStreams {
+	for cid, chanStream := range chanMsgStreams {
 		chanStream.Stop()
+
+		delete(chanMsgStreams, cid)
 	}
 
 	p.wg.Done()