diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index b494713e..10e8d91b 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -289,7 +289,6 @@ func (l *channelLink) Stop() {
 	close(l.quit)
 	l.wg.Wait()
 
-	l.cfg.BlockEpochs.Cancel()
 }
 
 // EligibleToForward returns a bool indicating if the channel is able to
@@ -355,6 +354,7 @@ func shouldAdjustCommitFee(netFee, chanFee btcutil.Amount) bool {
 func (l *channelLink) htlcManager() {
 	defer func() {
 		l.wg.Done()
+		l.cfg.BlockEpochs.Cancel()
 		log.Infof("ChannelLink(%v) has exited", l)
 	}()