diff --git a/tasmota/support.ino b/tasmota/support.ino
index b0b90b981..8804238f6 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -742,7 +742,11 @@ String GetDeviceHardware(void)
   }
 #endif  // ESP8266
 #ifdef ESP32
+#if CONFIG_IDF_TARGET_ESP32S2  // ESP32-S2
+  strcpy_P(buff, PSTR("ESP32-S2"));
+#else
   strcpy_P(buff, PSTR("ESP32"));
+#endif  // CONFIG_IDF_TARGET_ESP32S2
 #endif  // ESP32
   return String(buff);
 }
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 2d4604128..15a9ec558 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -573,6 +573,9 @@ void HttpHeaderCors(void)
 
 void WSHeaderSend(void)
 {
+  char server[32];
+  snprintf_P(server, sizeof(server), PSTR("Tasmota/%s (%s)"), TasmotaGlobal.version, GetDeviceHardware().c_str());
+  Webserver->sendHeader(F("Server"), server);
   Webserver->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
   Webserver->sendHeader(F("Pragma"), F("no-cache"));
   Webserver->sendHeader(F("Expires"), F("-1"));