diff --git a/src/WiFiServer.cpp b/src/WiFiServer.cpp
index 3756a1c7..e64581f4 100644
--- a/src/WiFiServer.cpp
+++ b/src/WiFiServer.cpp
@@ -62,7 +62,9 @@ WiFiClient WiFiServer::available(byte* status)
       if (sock == NO_SOCKET_AVAIL) {
           // check for new client socket
           sock = ServerDrv::availServer(_sock);
-      }
+      } else {
+          _lastSock = NO_SOCKET_AVAIL;
+      }    
     }
 
     if (sock != NO_SOCKET_AVAIL) {