diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index 40278553e..f0315b139 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -276,6 +276,9 @@ func (l *channelLink) Stop() {
 
 	log.Infof("ChannelLink(%v) is stopping", l)
 
+	// TODO(roasbeef): need to stop channel?
+	l.channel.Stop()
+
 	l.overflowQueue.Stop()
 
 	close(l.quit)