diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
index ec61b424b..1ed2a64c1 100644
--- a/libraries/ESP8266WiFi/src/WiFiServer.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -75,6 +75,11 @@ void WiFiServer::begin()
 
 extern "C" uint32_t esp_micros_at_task_start();
 
+bool WiFiServer::hasClient(){
+  if (_unclaimed) return true;
+  return false;
+}
+
 WiFiClient WiFiServer::available(byte* status)
 {
     static uint32_t lastPollTime = 0;
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
index 0bd427e2f..7e7b0491b 100644
--- a/libraries/ESP8266WiFi/src/WiFiServer.h
+++ b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -44,6 +44,7 @@ private:
 public:
   WiFiServer(uint16_t port);
   WiFiClient available(uint8_t* status = NULL);
+  bool hasClient();
   void begin();
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);