diff --git a/peer.go b/peer.go
index 71b06fc4..37096c5f 100644
--- a/peer.go
+++ b/peer.go
@@ -2502,6 +2502,8 @@ func (p *peer) sendMessage(sync, priority bool, msgs ...lnwire.Message) error {
 			return err
 		case <-p.quit:
 			return lnpeer.ErrPeerExiting
+		case <-p.server.quit:
+			return lnpeer.ErrPeerExiting
 		}
 	}