diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
index eb8e6af1dec..0330af12175 100644
--- a/libraries/WiFi/src/WiFiClient.cpp
+++ b/libraries/WiFi/src/WiFiClient.cpp
@@ -116,7 +116,9 @@ int WiFiClient::read() {
   if (!available())
     return -1;
 
-  ServerDrv::getData(_sock, &b);
+  if (!ServerDrv::getData(_sock, &b))
+    return -1;
+
   return b;
 }