diff --git a/hyperbahn/service_proxy.js b/hyperbahn/service_proxy.js
index <HASH>..<HASH> 100644
--- a/hyperbahn/service_proxy.js
+++ b/hyperbahn/service_proxy.js
@@ -302,10 +302,12 @@ function removeServicePeer(serviceName, hostPort) {
         return;
     }
 
-    var peer = svcchan.peers.get(hostPort);
-    if (peer) {
-        peer.close(noop);
+    var peer = self.channel.peers.get(hostPort);
+    if (!peer) {
+        return;
     }
+
+    peer.close(noop);
     self.channel.peers.delete(hostPort);
 };
ServiceDispatchHandler: get peer from root channel in #removeServicePeer