diff --git a/rpcmiddleware/manager.go b/rpcmiddleware/manager.go
index 6a43c173..cdee7eb2 100644
--- a/rpcmiddleware/manager.go
+++ b/rpcmiddleware/manager.go
@@ -36,8 +36,8 @@ func NewManager(interceptTimeout time.Duration,
 }
 
 // Start starts the firewall by registering the interceptors with lnd.
-func (f *Manager) Start() error {
-	ctxc, cancel := context.WithCancel(context.Background())
+func (f *Manager) Start(ctx context.Context) error {
+	ctxc, cancel := context.WithCancel(ctx)
 	f.cancel = cancel
 
 	for _, i := range f.interceptors {
diff --git a/terminal.go b/terminal.go
index 2a9cbb31..1006f0f3 100644
--- a/terminal.go
+++ b/terminal.go
@@ -1104,7 +1104,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
 		g.lndClient.Client, g.errQueue.ChanIn(), mw...,
 	)
 
-	if err = g.middleware.Start(); err != nil {
+	if err = g.middleware.Start(ctx); err != nil {
 		return err
 	}
 	g.middlewareStarted = true