diff --git a/WiFi/WiFiClient.cpp b/WiFi/WiFiClient.cpp
index 470a42938..83c0d10b9 100755
--- a/WiFi/WiFiClient.cpp
+++ b/WiFi/WiFiClient.cpp
@@ -70,12 +70,17 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size) {
   }
 
 
-  if ((!ServerDrv::sendData(_sock, buf, size)) ||
-		  (!ServerDrv::checkDataSent(_sock)))
+  if (!ServerDrv::sendData(_sock, buf, size))
   {
 	  setWriteError();
       return 0;
   }
+  if (!ServerDrv::checkDataSent(_sock))
+  {
+	  setWriteError();
+      return 0;
+  }
+
   return size;
 }
 
diff --git a/WiFi/utility/server_drv.cpp b/WiFi/utility/server_drv.cpp
index a325d5a06..ce03604b4 100644
--- a/WiFi/utility/server_drv.cpp
+++ b/WiFi/utility/server_drv.cpp
@@ -226,8 +226,8 @@ bool ServerDrv::sendData(uint8_t sock, const uint8_t *data, uint16_t len)
 
 uint8_t ServerDrv::checkDataSent(uint8_t sock)
 {
-	const uint16_t TIMEOUT_DATA_SENT = 250;
-	static uint16_t timeout = 0;
+	const uint16_t TIMEOUT_DATA_SENT = 25;
+    uint16_t timeout = 0;
 	uint8_t _data = 0;
 	uint8_t _dataLen = 0;
 
@@ -250,7 +250,7 @@ uint8_t ServerDrv::checkDataSent(uint8_t sock)
 		if (_data) timeout = 0;
 		else{
 			++timeout;
-			delay(10);
+			delay(100);
 		}
 
 	}while((_data==0)&&(timeout<TIMEOUT_DATA_SENT));