diff --git a/websocket-sharp/Net/WebHeaderCollection.cs b/websocket-sharp/Net/WebHeaderCollection.cs
index 75d5fc7f..a1507f3e 100644
--- a/websocket-sharp/Net/WebHeaderCollection.cs
+++ b/websocket-sharp/Net/WebHeaderCollection.cs
@@ -1719,7 +1719,17 @@ namespace WebSocketSharp.Net
       var key = header.ToString ();
       var name = getHeaderName (key);
 
-      doWithCheckingState (setWithoutCheckingName, name, value, false, true);
+      value = checkValue (value);
+
+      checkRestricted (name, false);
+      checkAllowed (false);
+
+      base.Set (name, value);
+
+      if (_state != HttpHeaderType.Unspecified)
+        return;
+
+      _state = HttpHeaderType.Request;
     }
 
     /// <summary>