diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs
index 51bf5e0d..5c9054e1 100644
--- a/websocket-sharp/Net/EndPointManager.cs
+++ b/websocket-sharp/Net/EndPointManager.cs
@@ -117,7 +117,7 @@ namespace WebSocketSharp.Net
             listener.ReuseAddress
           );
 
-        setEndPointListener (lsnr);
+        setEndPointListener (addr, port, lsnr);
       }
 
       lsnr.AddPrefix (pref, listener);
@@ -160,19 +160,6 @@ namespace WebSocketSharp.Net
       lsnr.RemovePrefix (pref, listener);
     }
 
-    private static void setEndPointListener (EndPointListener listener)
-    {
-      var addr = listener.Address;
-
-      Dictionary<int, EndPointListener> endpoints;
-      if (!_addressToEndpoints.TryGetValue (addr, out endpoints)) {
-        endpoints = new Dictionary<int, EndPointListener> ();
-        _addressToEndpoints[addr] = endpoints;
-      }
-
-      endpoints[listener.Port] = listener;
-    }
-
     private static void setEndPointListener (IPAddress address, int port, EndPointListener listener)
     {
       Dictionary<int, EndPointListener> endpoints;