diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 61d06ada..4052a12b 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -451,6 +451,9 @@ namespace WebSocketSharp.Net
 
       List<HttpConnection> conns = null;
       lock (_unregisteredSync) {
+        if (_unregistered.Count == 0)
+          return;
+
         conns = new List<HttpConnection> (_unregistered.Keys);
         _unregistered.Clear ();
       }