diff --git a/websocket-sharp/Net/HttpListenerContext.cs b/websocket-sharp/Net/HttpListenerContext.cs
index 137bb728..1b65d2fe 100644
--- a/websocket-sharp/Net/HttpListenerContext.cs
+++ b/websocket-sharp/Net/HttpListenerContext.cs
@@ -342,9 +342,7 @@ namespace WebSocketSharp.Net
         }
       }
 
-      _websocketContext = new HttpListenerWebSocketContext (this, protocol);
-
-      return _websocketContext;
+      return GetWebSocketContext (protocol);
     }
 
     #endregion