diff --git a/peer.go b/peer.go
index 751f1464..bbf3a60f 100644
--- a/peer.go
+++ b/peer.go
@@ -753,6 +753,8 @@ func (ms *msgStream) msgConsumer() {
 			// Otherwise, we'll check the message queue for any new
 			// items.
 			select {
+			case <-ms.peer.quit:
+				return
 			case <-ms.quit:
 				ms.msgCond.L.Unlock()
 				return
@@ -777,6 +779,8 @@ func (ms *msgStream) msgConsumer() {
 		// grow indefinitely.
 		select {
 		case ms.producerSema <- struct{}{}:
+		case <-ms.peer.quit:
+			return
 		case <-ms.quit:
 			return
 		}