diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index c6b2819ff..8c56b1e4e 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -3710,6 +3710,7 @@ func (h *persistentLinkHarness) restart(restartSwitch bool,
 
 	// First, remove the link from the switch.
 	h.coreLink.cfg.Switch.RemoveLink(h.link.ChanID())
+	h.coreLink.WaitForShutdown()
 
 	var htlcSwitch *Switch
 	if restartSwitch {