diff --git a/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs b/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs
index 2ccc7d97..8ae91928 100644
--- a/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs
+++ b/Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs
@@ -154,7 +154,11 @@ namespace MQTTnet.Implementations
 
         private void CreateStreams()
         {
-            _readStream = _socket.InputStream.AsStreamForRead(_bufferSize);
+            // Attention! Do not set the buffer for the read method. This will
+            // limit the internal buffer and the read operation will hang forever
+            // is more data than the buffer size was received.
+            _readStream = _socket.InputStream.AsStreamForRead();
+
             _writeStream = _socket.OutputStream.AsStreamForWrite(_bufferSize);
         }