diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index 6d7d41f5..74efcaff 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -395,12 +395,10 @@ namespace WebSocketSharp.Net
 
     private void removeConnection ()
     {
-      if (_lastListener == null) {
+      if (_lastListener != null)
+        _lastListener.RemoveConnection (this);
+      else
         _listener.RemoveConnection (this);
-        return;
-      }
-
-      _lastListener.RemoveConnection (this);
     }
 
     private void unbind ()