diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index 3705d8b06..d2cf64186 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -875,6 +875,7 @@ func (s *Switch) addLink(link ChannelLink) error {
 	s.interfaceIndex[peerPub][link] = struct{}{}
 
 	if err := link.Start(); err != nil {
+		s.removeLink(link.ChanID())
 		return err
 	}