diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
index 8ec2329e32..e373a3a8a4 100644
--- a/libraries/ESP8266WiFi/src/include/ClientContext.h
+++ b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -26,7 +26,6 @@ class WiFiClient;
 
 typedef void (*discard_cb_t)(void*, ClientContext*);
 
-extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
 #include "DataSource.h"
@@ -333,7 +332,7 @@ class ClientContext
                 last_sent = millis();
             }
 
-            esp_yield(); // from sys or os context
+            delay(0); // from sys or os context
 
             if ((state() != ESTABLISHED) || (sndbuf == TCP_SND_BUF)) {
                 break;
@@ -456,7 +455,7 @@ class ClientContext
             }
 
             ++_send_waiting;
-            esp_yield();
+            delay(0);
         } while(true);
         _send_waiting = 0;