diff --git a/esp3d/configuration.h b/esp3d/configuration.h
index 036601a7..f45c51d0 100644
--- a/esp3d/configuration.h
+++ b/esp3d/configuration.h
@@ -56,14 +56,14 @@
 #define TELNET_FEATURE
 
 //WS_DATA_FEATURE: allow to connect serial from Websocket
-//#define WS_DATA_FEATURE
+#define WS_DATA_FEATURE
 
 //DISPLAY_DEVICE: allow screen output
 //OLED_I2C_SSD1306          1
 //OLED_I2C_SSDSH1106        2
 //TFT_SPI_ILI9341_320X240   3
 //TFT_SPI_ILI9488_480X320 4
-#define DISPLAY_DEVICE TFT_SPI_ILI9488_480X320
+//#define DISPLAY_DEVICE TFT_SPI_ILI9488_480X320
 
 //UI_TYPE_BASIC      1
 //UI_TYPE_ADVANCED   2
diff --git a/esp3d/src/core/espcmd/ESP400.cpp b/esp3d/src/core/espcmd/ESP400.cpp
index 7749aa3e..7fd522f4 100644
--- a/esp3d/src/core/espcmd/ESP400.cpp
+++ b/esp3d/src/core/espcmd/ESP400.cpp
@@ -228,6 +228,25 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
     output->print (Settings_ESP3D::get_min_int32_value(ESP_TELNET_PORT));
     output->print ("\"}");
 #endif //TELNET
+#ifdef WS_DATA_FEATURE
+    //Websocket On service
+    output->print (",{\"F\":\"service/websocketp\",\"P\":\"");
+    output->print (ESP_WEBSOCKET_ON);
+    output->print ("\",\"T\":\"B\",\"V\":\"");
+    output->print (Settings_ESP3D::read_byte(ESP_WEBSOCKET_ON));
+    output->print ("\",\"H\":\"enable\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}");
+
+    //Websocket Port
+    output->print (",{\"F\":\"service/websocketp\",\"P\":\"");
+    output->print (ESP_WEBSOCKET_PORT);
+    output->print ("\",\"T\":\"I\",\"V\":\"");
+    output->print (Settings_ESP3D::read_uint32(ESP_WEBSOCKET_PORT));
+    output->print ("\",\"H\":\"port\",\"S\":\"");
+    output->print (Settings_ESP3D::get_max_int32_value(ESP_WEBSOCKET_PORT));
+    output->print ("\",\"M\":\"");
+    output->print (Settings_ESP3D::get_min_int32_value(ESP_WEBSOCKET_PORT));
+    output->print ("\"}");
+#endif //WS_DATA_FEATURE
 
 #ifdef FTP_FEATURE
     //FTP On service/ftp