diff --git a/peer.go b/peer.go
index 33cee2ae..37f87e75 100644
--- a/peer.go
+++ b/peer.go
@@ -318,6 +318,12 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
 			return fmt.Errorf("peer shutting down")
 		}
 
+		// Skip adding any permanently irreconcilable channels to the
+		// htlcswitch.
+		if dbChan.IsBorked {
+			continue
+		}
+
 		blockEpoch, err := p.server.cc.chainNotifier.RegisterBlockEpochNtfn()
 		if err != nil {
 			return err