diff --git a/websocket-sharp/Net/HttpListenerRequest.cs b/websocket-sharp/Net/HttpListenerRequest.cs
index 171eaa76..62c99ab8 100644
--- a/websocket-sharp/Net/HttpListenerRequest.cs
+++ b/websocket-sharp/Net/HttpListenerRequest.cs
@@ -165,7 +165,10 @@ namespace WebSocketSharp.Net
     /// </value>
     public Encoding ContentEncoding {
       get {
-        return _contentEncoding ?? Encoding.UTF8;
+        if (_contentEncoding == null)
+          _contentEncoding = getContentEncoding () ?? Encoding.UTF8;
+
+        return _contentEncoding;
       }
     }
 
@@ -623,17 +626,6 @@ namespace WebSocketSharp.Net
         _contentLength = len;
         return;
       }
-
-      if (lower == "content-type") {
-        try {
-          _contentEncoding = HttpUtility.GetEncoding (val);
-        }
-        catch {
-          _context.ErrorMessage = "Invalid Content-Type header";
-        }
-
-        return;
-      }
     }
 
     internal void FinishInitialization ()