diff --git a/src/app/WEBServerManager.cpp b/src/app/WEBServerManager.cpp
index 91bd9e6..3efedba 100644
--- a/src/app/WEBServerManager.cpp
+++ b/src/app/WEBServerManager.cpp
@@ -1,7 +1,7 @@
 #include "WEBServerManager.h"
 
-#define DEBUG
-//#define DEBUG_BODY
+//#define DEBUG
+#define DEBUG_BODY
 //#define DEBUG_PARAMETER
 //#define DEBUG_CONTENT_LENGTH
 //#define DEBUG_RAW
@@ -98,7 +98,7 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
   _httpParserState = INIT;
   _clientTimeout = millis();
   boolean slashesOrAntiSlashesOnly(true);
-  while(wifiClient->available() || ( millis() - _clientTimeout < activeTimeout))
+  while((wifiClient->available() || ( millis() - _clientTimeout < activeTimeout)) && wifiClient->connected())
   {
     if(wifiClient->available())
     {
@@ -262,13 +262,13 @@ boolean WEBServerManager::parseQuery(WiFiClient *wifiClient)
 	      default :
 	  	    break;
 	    }
-
+      //Exit condition
       if(receivingDone) break;
       if(_httpRequestData.HRM == POST && dataBytes != 0 && dataBytes == dataBytesCounter) break;
      
       _clientTimeout = millis();
     }
-	ESP.wdtFeed();
+  yield();
   }
 
   if(parseBuffer != NULL)