diff --git a/docs/espXXX.md b/docs/espXXX.md
index 6bdc2410..7b0aa84f 100644
--- a/docs/espXXX.md
+++ b/docs/espXXX.md
@@ -1650,7 +1650,10 @@ Passwords are not displayed and replaced by `********`
 {"250000":"250000"},
 {"500000":"500000"},
 {"921600":"921600"},
-{"1958400":"1958400"}]},
+{"1000000":"1000000"},
+{"1958400":"1958400"},
+{"2000000":"2000000"},
+]},
 {"F":"system/boot","P":"320","T":"I","V":"100","H":"bootdelay","S":"40000","M":"0"},
 {"F":"system/boot","P":"1023","T":"B","V":"0","H":"verbose","O":[{"no":"0"},{"yes":"1"}]},
 {"F":"system/outputmsg","P":"129","T":"B","V":"1","H":"serial","O":[{"no":"0"},{"yes":"1"}]},
@@ -3064,7 +3067,9 @@ can be in JSON or plain text
     - 250000
     - 500000
     - 921600
+    - 1000000
     - 1958400
+    - 2000000
 
 * pwd=<admin password>
 the admin password if authentication is enabled
diff --git a/esp3d/configuration.h b/esp3d/configuration.h
index a02ab2c4..84d5215c 100644
--- a/esp3d/configuration.h
+++ b/esp3d/configuration.h
@@ -576,7 +576,7 @@
 /* Add serial task
  * ESP32 need to add a task to handle serial communication
  */
-// #define SERIAL_INDEPENDANT_TASK
+#define SERIAL_INDEPENDANT_TASK
 
 /************************************
  *
diff --git a/esp3d/src/core/commands/ESP111.cpp b/esp3d/src/core/commands/ESP111.cpp
index 33aad028..9869577a 100644
--- a/esp3d/src/core/commands/ESP111.cpp
+++ b/esp3d/src/core/commands/ESP111.cpp
@@ -48,8 +48,6 @@ void ESP3DCommands::ESP111(int cmd_params_pos, ESP3DMessage* msg) {
     return;
   }
 #endif  // AUTHENTICATION_FEATURE
-  tmpstr = get_clean_param(msg, cmd_params_pos);
-
   tmpstr = get_param(msg, cmd_params_pos, "OUTPUT=");
   if (tmpstr == "PRINTER") {
     msg->target = ESP3DClientType::remote_screen;
diff --git a/esp3d/src/core/commands/ESP400.cpp b/esp3d/src/core/commands/ESP400.cpp
index b34b5761..09430f08 100644
--- a/esp3d/src/core/commands/ESP400.cpp
+++ b/esp3d/src/core/commands/ESP400.cpp
@@ -110,7 +110,7 @@ const char* SupportedApChannelsStr[] = {"1", "2", "3",  "4",  "5",  "6",  "7",
 
 const char* SupportedBaudListSizeStr[] = {
     "9600",   "19200",  "38400",  "57600",  "74880",  "115200",
-    "230400", "250000", "500000", "921600", "1958400"};
+    "230400", "250000", "500000", "921600", "1000000", "1958400","2000000"};
 
 #ifdef SENSOR_DEVICE
 
diff --git a/esp3d/src/modules/serial/serial_service.cpp b/esp3d/src/modules/serial/serial_service.cpp
index 049ce698..343bb969 100644
--- a/esp3d/src/modules/serial/serial_service.cpp
+++ b/esp3d/src/modules/serial/serial_service.cpp
@@ -66,7 +66,7 @@ TaskHandle_t _hserialtask = nullptr;
 
 const uint32_t SupportedBaudList[] = {9600,   19200,  38400,  57600,
                                       74880,  115200, 230400, 250000,
-                                      500000, 921600, 1958400};
+                                      500000, 921600, 1000000, 1958400, 2000000};
 const size_t SupportedBaudListSize = sizeof(SupportedBaudList) / sizeof(long);
 
 #define TIMEOUT_SERIAL_FLUSH 1500