diff --git a/Meshtastic/Connections/TcpConnection.cs b/Meshtastic/Connections/TcpConnection.cs
index dfa9dd9..6812f17 100644
--- a/Meshtastic/Connections/TcpConnection.cs
+++ b/Meshtastic/Connections/TcpConnection.cs
@@ -58,15 +58,16 @@ public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, T
         if (networkStream == null)
             throw new ApplicationException("Could not establish network stream");
 
-        var buffer = new byte[DEFAULT_BUFFER_SIZE];
-        while (networkStream.CanRead)
-        {
-            await networkStream.ReadExactlyAsync(buffer);
-            foreach (var item in buffer)
+        var buffer = new byte[DEFAULT_BUFFER_SIZE];
+        int bytesRead = await networkStream.ReadAsync(buffer, 0, buffer.Length);
+        while (bytesRead > 0)
+        {
+            for (int i = 0; i < bytesRead; i++)
             {
-                if (await ParsePackets(item, isComplete))
+                if (await ParsePackets(buffer[i], isComplete))
                     return;
             }
+            bytesRead = await networkStream.ReadAsync(buffer, 0, buffer.Length);
         }
     }