diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go
index fa96829b8..c7d3eb0f8 100644
--- a/htlcswitch/mock.go
+++ b/htlcswitch/mock.go
@@ -330,7 +330,7 @@ func (s *mockServer) Stop() {
 		return
 	}
 
-	go s.htlcSwitch.Stop()
+	s.htlcSwitch.Stop()
 
 	close(s.quit)
 	s.wg.Wait()