diff --git a/pkg/pubsub/publisher.go b/pkg/pubsub/publisher.go
index f017262ae3..534b74ad4d 100644
--- a/pkg/pubsub/publisher.go
+++ b/pkg/pubsub/publisher.go
@@ -68,6 +68,7 @@ func (p *Publisher) Publish(v interface{}) {
 func (p *Publisher) Close() {
 	p.m.Lock()
 	for sub := range p.subscribers {
+		delete(p.subscribers, sub)
 		close(sub)
 	}
 	p.m.Unlock()