diff --git a/esp3d/config.h b/esp3d/config.h
index e06966f3..91f8673f 100644
--- a/esp3d/config.h
+++ b/esp3d/config.h
@@ -100,6 +100,8 @@
 #endif
 #endif
 
+//Serial rx buffer size is 256 but can be extended
+#define SERIAL_RX_BUFFER_SIZE 512
 //DEBUG Flag do not do this when connected to printer !!!
 //#define DEBUG_ESP3D
 //#define DEBUG_OUTPUT_SPIFFS
diff --git a/esp3d/esp3d.ino b/esp3d/esp3d.ino
index 3233ea8c..681a319c 100644
--- a/esp3d/esp3d.ino
+++ b/esp3d/esp3d.ino
@@ -96,6 +96,7 @@ void setup()
     if(breset_config) {
         //update EEPROM with default settings
         Serial.begin(DEFAULT_BAUD_RATE);
+        Serial.setRxBufferSize(SERIAL_RX_BUFFER_SIZE);
         delay(2000);
         Serial.println(F("M117 ESP EEPROM reset"));
 #ifdef DEBUG_ESP3D
@@ -116,6 +117,7 @@ void setup()
 #endif
     //setup serial
     Serial.begin(baud_rate);
+    Serial.setRxBufferSize(SERIAL_RX_BUFFER_SIZE);
     delay(1000);
     LOG("Serial Set\r\n");
     wifi_config.baud_rate=baud_rate;