diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs
index 166f1164..37f34f9c 100644
--- a/websocket-sharp/Net/EndPointManager.cs
+++ b/websocket-sharp/Net/EndPointManager.cs
@@ -214,10 +214,9 @@ namespace WebSocketSharp.Net
         if (!_endpoints.TryGetValue (endpoint, out lsnr))
           return false;
 
-        _endpoints.Remove (endpoint);
         lsnr.Close ();
 
-        return true;
+        return _endpoints.Remove (endpoint);
       }
     }