diff --git a/libraries/ArduinoOTA/src/ArduinoOTA.cpp b/libraries/ArduinoOTA/src/ArduinoOTA.cpp
index fe85580f566..a32cba6fa29 100644
--- a/libraries/ArduinoOTA/src/ArduinoOTA.cpp
+++ b/libraries/ArduinoOTA/src/ArduinoOTA.cpp
@@ -315,6 +315,10 @@ void ArduinoOTAClass::_runUpdate() {
         size_t r = client.read(buf, available);
         if(r != available){
             log_w("didn't read enough! %u != %u", r, available);
+	    if((int32_t) r<0) {
+	        delay(1);
+	        continue;  	//let's not try to write 4 gigabytes when client.read returns -1
+	    }
         }
 
         written = Update.write(buf, r);