diff --git a/websocket-sharp/Net/HttpListenerRequest.cs b/websocket-sharp/Net/HttpListenerRequest.cs
index 5f1ce8c2..2f78d3c3 100644
--- a/websocket-sharp/Net/HttpListenerRequest.cs
+++ b/websocket-sharp/Net/HttpListenerRequest.cs
@@ -280,14 +280,8 @@ namespace WebSocketSharp.Net
     /// </value>
     public Stream InputStream {
       get {
-        if (!HasEntityBody)
-          return Stream.Null;
-
-        if (_inputStream == null) {
-          _inputStream = _connection.GetRequestStream (
-                           _contentLength, _chunked
-                         );
-        }
+        if (_inputStream == null)
+          _inputStream = getInputStream () ?? Stream.Null;
 
         return _inputStream;
       }