diff --git a/server.go b/server.go
index d099fc931..9a7276948 100644
--- a/server.go
+++ b/server.go
@@ -2411,6 +2411,10 @@ func (s *server) Stop() error {
 		if err := s.invoices.Stop(); err != nil {
 			srvrLog.Warnf("failed to stop invoices: %v", err)
 		}
+		if err := s.interceptableSwitch.Stop(); err != nil {
+			srvrLog.Warnf("failed to stop interceptable "+
+				"switch: %v", err)
+		}
 		if err := s.invoiceHtlcModifier.Stop(); err != nil {
 			srvrLog.Warnf("failed to stop htlc invoices "+
 				"modifier: %v", err)