diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index c7352e91..5fb0b66e 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -461,10 +461,13 @@ namespace WebSocketSharp.Net
 
     private void removeConnection ()
     {
-      if (_lastListener != null)
-        _lastListener.RemoveConnection (this);
-      else
+      if (_lastListener == null) {
         _listener.RemoveConnection (this);
+
+        return;
+      }
+
+      _lastListener.RemoveConnection (this);
     }
 
     private void unregisterContext ()