diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
index 707e486cc..534c7fa89 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -123,6 +123,19 @@ void ICACHE_FLASH_ATTR WiFiClient::_err(int8_t err)
     esp_schedule();
 }
 
+
+void ICACHE_FLASH_ATTR WiFiClient::setNoDelay(bool nodelay) {
+    if (!_client)
+        return;
+    _client->setNoDelay(nodelay);
+}
+
+bool ICACHE_FLASH_ATTR WiFiClient::getNoDelay() {
+    if (!_client)
+        return false;
+    return _client->getNoDelay();
+}
+
 size_t ICACHE_FLASH_ATTR WiFiClient::write(uint8_t b) 
 {
     return write(&b, 1);
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.h b/libraries/ESP8266WiFi/src/WiFiClient.h
index ca6d26637..f01aead13 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.h
+++ b/libraries/ESP8266WiFi/src/WiFiClient.h
@@ -55,6 +55,8 @@ public:
 
   IPAddress remoteIP();
   uint16_t  remotePort();
+  bool getNoDelay();
+  void setNoDelay(bool nodelay);
 
   template<typename T> size_t write(T &src){
     uint8_t obuf[1460];