diff --git a/peer/brontide.go b/peer/brontide.go
index 257dcdac0..e58b703dc 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -2044,6 +2044,7 @@ func (p *Brontide) pingHandler() {
 			"subscription: %v", err)
 		return
 	}
+	defer blockEpochs.Cancel()
 
 	var (
 		pingPayload [wire.MaxBlockHeaderPayload]byte