diff --git a/lnd_test.go b/lnd_test.go
index 607fdb7f..71bc2ca6 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -2230,6 +2230,12 @@ func testGraphTopologyNotifications(net *networkHarness, t *harnessTest) {
 				return
 			default:
 				graphUpdate, err := topologyClient.Recv()
+				select {
+				case <-quit:
+					return
+				default:
+				}
+
 				if err == io.EOF {
 					return
 				} else if err != nil {