diff --git a/peer.go b/peer.go
index 52840f4de..a0a5cc8b8 100644
--- a/peer.go
+++ b/peer.go
@@ -383,15 +383,17 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) error {
 			DecodeOnionObfuscator: p.server.sphinx.ExtractErrorEncrypter,
 			GetLastChannelUpdate: createGetLastUpdate(p.server.chanRouter,
 				p.PubKey(), lnChan.ShortChanID()),
-			DebugHTLC:     cfg.DebugHTLC,
-			HodlHTLC:      cfg.HodlHTLC,
-			Registry:      p.server.invoices,
-			Switch:        p.server.htlcSwitch,
-			FwrdingPolicy: *forwardingPolicy,
-			FeeEstimator:  p.server.cc.feeEstimator,
-			BlockEpochs:   blockEpoch,
-			PreimageCache: p.server.witnessBeacon,
-			ChainEvents:   chainEvents,
+			DebugHTLC:      cfg.DebugHTLC,
+			HodlHTLC:       cfg.HodlHTLC,
+			Registry:       p.server.invoices,
+			Switch:         p.server.htlcSwitch,
+			Circuits:       p.server.htlcSwitch.CircuitModifier(),
+			ForwardPackets: p.server.htlcSwitch.ForwardPackets,
+			FwrdingPolicy:  *forwardingPolicy,
+			FeeEstimator:   p.server.cc.feeEstimator,
+			BlockEpochs:    blockEpoch,
+			PreimageCache:  p.server.witnessBeacon,
+			ChainEvents:    chainEvents,
 			UpdateContractSignals: func(signals *contractcourt.ContractSignals) error {
 				return p.server.chainArb.UpdateContractSignals(
 					*chanPoint, signals,
@@ -1281,15 +1283,17 @@ out:
 				DecodeOnionObfuscator: p.server.sphinx.ExtractErrorEncrypter,
 				GetLastChannelUpdate: createGetLastUpdate(p.server.chanRouter,
 					p.PubKey(), newChanReq.channel.ShortChanID()),
-				DebugHTLC:     cfg.DebugHTLC,
-				HodlHTLC:      cfg.HodlHTLC,
-				Registry:      p.server.invoices,
-				Switch:        p.server.htlcSwitch,
-				FwrdingPolicy: p.server.cc.routingPolicy,
-				FeeEstimator:  p.server.cc.feeEstimator,
-				BlockEpochs:   blockEpoch,
-				PreimageCache: p.server.witnessBeacon,
-				ChainEvents:   chainEvents,
+				DebugHTLC:      cfg.DebugHTLC,
+				HodlHTLC:       cfg.HodlHTLC,
+				Registry:       p.server.invoices,
+				Switch:         p.server.htlcSwitch,
+				Circuits:       p.server.htlcSwitch.CircuitModifier(),
+				ForwardPackets: p.server.htlcSwitch.ForwardPackets,
+				FwrdingPolicy:  p.server.cc.routingPolicy,
+				FeeEstimator:   p.server.cc.feeEstimator,
+				BlockEpochs:    blockEpoch,
+				PreimageCache:  p.server.witnessBeacon,
+				ChainEvents:    chainEvents,
 				UpdateContractSignals: func(signals *contractcourt.ContractSignals) error {
 					return p.server.chainArb.UpdateContractSignals(
 						*chanPoint, signals,