diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp
index e77c2445218..a72c6d944ec 100644
--- a/libraries/HTTPClient/src/HTTPClient.cpp
+++ b/libraries/HTTPClient/src/HTTPClient.cpp
@@ -1041,6 +1041,10 @@ int HTTPClient::writeToStreamDataBlock(Stream * stream, int size)
                 if(readBytes > buff_size) {
                     readBytes = buff_size;
                 }
+		    
+		// stop if no more reading    
+		if (readBytes == 0)
+			break;
 
                 // read data
                 int bytesRead = _tcp->readBytes(buff, readBytes);