diff --git a/websocket-sharp/Net/HttpListenerRequest.cs b/websocket-sharp/Net/HttpListenerRequest.cs index d5e9e435..9c9bb466 100644 --- a/websocket-sharp/Net/HttpListenerRequest.cs +++ b/websocket-sharp/Net/HttpListenerRequest.cs @@ -404,7 +404,9 @@ namespace WebSocketSharp.Net get { if (_queryString == null) { var url = Url; - _queryString = QueryStringCollection.Parse ( + + _queryString = QueryStringCollection + .Parse ( url != null ? url.Query : null, Encoding.UTF8 );