diff --git a/internal/messagequeue/messagequeue.go b/internal/messagequeue/messagequeue.go
index 7bcc087f1b1d2f6759857b7698d76a9859d090ce..ad85e5234cc2664d0664cded17ed15f6eb25c9f2 100644
--- a/internal/messagequeue/messagequeue.go
+++ b/internal/messagequeue/messagequeue.go
@@ -333,7 +333,7 @@ func (mq *MessageQueue) runQueue() {
 	}
 
 	var workScheduled time.Time
-	for {
+	for mq.ctx.Err() == nil {
 		select {
 		case <-mq.rebroadcastTimer.C:
 			mq.rebroadcastWantlist()