diff --git a/server.go b/server.go
index ab049366..692e59b3 100644
--- a/server.go
+++ b/server.go
@@ -958,6 +958,8 @@ func (s *server) sendToPeer(target *btcec.PublicKey,
 		select {
 		case err := <-errChan:
 			return err
+		case <-targetPeer.quit:
+			return fmt.Errorf("peer shutting down")
 		case <-s.quit:
 			return ErrServerShuttingDown
 		}