diff --git a/lib/node-http-proxy/http-proxy.js b/lib/node-http-proxy/http-proxy.js
index ffc2c9d..cdc5b66 100644
--- a/lib/node-http-proxy/http-proxy.js
+++ b/lib/node-http-proxy/http-proxy.js
@@ -472,6 +472,8 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
   // the appropriate events.
   //
   function onUpgrade (reverseProxy, proxySocket) {
+    var detached;
+
     if (!reverseProxy) {
       proxySocket.end();
       socket.end();
@@ -543,12 +545,15 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
     // from `reverseProxy` and `proxySocket`.
     //
     function detach() {
-      proxySocket.destroySoon();
-      proxySocket.removeListener('end', listeners.onIncomingClose);
-      proxySocket.removeListener('data', listeners.onIncoming);
-      reverseProxy.incoming.socket.destroySoon();
-      reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
-      reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
+      if (!detached) {
+        detached = true;
+        proxySocket.destroySoon();
+        proxySocket.removeListener('end', listeners.onIncomingClose);
+        proxySocket.removeListener('data', listeners.onIncoming);
+        reverseProxy.incoming.socket.destroySoon();
+        reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
+        reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
+      }
     }
 
    //