diff --git a/src/AsyncEventSource.cpp b/src/AsyncEventSource.cpp
index 6262be5..bbe28b3 100644
--- a/src/AsyncEventSource.cpp
+++ b/src/AsyncEventSource.cpp
@@ -175,6 +175,7 @@ void AsyncEventSource::onConnect(ArEventHandlerFunction cb){
 }
 
 void AsyncEventSource::_addClient(AsyncEventSourceClient * client){
+  client->setRxTimeout(0);
   /*char * temp = (char *)malloc(2054);
   if(temp != NULL){
     memset(temp+1,' ',2048);
diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
index 92042f3..79691e1 100644
--- a/src/AsyncWebSocket.cpp
+++ b/src/AsyncWebSocket.cpp
@@ -621,6 +621,7 @@ void AsyncWebSocket::_handleEvent(AsyncWebSocketClient * client, AwsEventType ty
 }
 
 void AsyncWebSocket::_addClient(AsyncWebSocketClient * client){
+  client->setRxTimeout(0);
   if(_clients == NULL){
     _clients = client;
     return;