diff --git a/WiFi/WiFiClient.cpp b/WiFi/WiFiClient.cpp
index ce325cc9f..8f517cc19 100755
--- a/WiFi/WiFiClient.cpp
+++ b/WiFi/WiFiClient.cpp
@@ -126,7 +126,8 @@ uint8_t WiFiClient::connected() {
   } else {
     uint8_t s = status();
 
-    return !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 || s == FIN_WAIT_2 ||
+    return !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 ||
+    		s == FIN_WAIT_2 || s == TIME_WAIT ||
              (s == CLOSE_WAIT && !available()));
   }
 }