diff --git a/websocket-sharp/Net/QueryStringCollection.cs b/websocket-sharp/Net/QueryStringCollection.cs
index 564debdd..4a95737c 100644
--- a/websocket-sharp/Net/QueryStringCollection.cs
+++ b/websocket-sharp/Net/QueryStringCollection.cs
@@ -70,17 +70,15 @@ namespace WebSocketSharp.Net
 
     public static QueryStringCollection Parse (string query, Encoding encoding)
     {
-      var ret = new QueryStringCollection ();
-
       if (query == null)
-        return ret;
+        return new QueryStringCollection (1);
 
       var len = query.Length;
       if (len == 0)
-        return ret;
+        return new QueryStringCollection (1);
 
       if (query == "?")
-        return ret;
+        return new QueryStringCollection (1);
 
       if (query[0] == '?')
         query = query.Substring (1);
@@ -88,6 +86,8 @@ namespace WebSocketSharp.Net
       if (encoding == null)
         encoding = Encoding.UTF8;
 
+      var ret = new QueryStringCollection ();
+
       var components = query.Split ('&');
       foreach (var component in components) {
         len = component.Length;