diff --git a/metropolis/node/core/rpc/resolver/watcher.go b/metropolis/node/core/rpc/resolver/watcher.go
index 281fc59..3ea714c 100644
--- a/metropolis/node/core/rpc/resolver/watcher.go
+++ b/metropolis/node/core/rpc/resolver/watcher.go
@@ -114,9 +114,12 @@
 }
 
 func (r *clientWatcher) Close() {
-	r.resolver.reqC <- &request{
+	select {
+	case <-r.resolver.ctx.Done():
+	case r.resolver.reqC <- &request{
 		unsub: &requestUnsubscribe{
 			id: r.subscription.id,
 		},
+	}:
 	}
 }