diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
index c709dcfdd..99068661c 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -178,17 +178,18 @@ void ESP8266WebServer::send(int code, const String& content_type, const String&
 }
 
 void ESP8266WebServer::sendContent(const String& content) {
+  const size_t unit_size = HTTP_DOWNLOAD_UNIT_SIZE;
   size_t size_to_send = content.length();
-  size_t size_sent = 0;
-  while(size_to_send) {
-    const size_t unit_size = HTTP_DOWNLOAD_UNIT_SIZE;
+  const char* send_start = content.c_str();
+  
+  while (size_to_send) {
     size_t will_send = (size_to_send < unit_size) ? size_to_send : unit_size;
-    size_t sent = _currentClient.write(content.c_str() + size_sent, will_send);
-    size_to_send -= sent;
-    size_sent += sent;
+    size_t sent = _currentClient.write(send_start, will_send);
     if (sent == 0) {
       break;
     }
+    size_to_send -= sent;
+    send_start += sent;
   }
 }