diff --git a/CHANGELOG.md b/CHANGELOG.md
index 018e3233b..ddb4b5660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
 ## [13.4.0.4]
 ### Added
 - Command ``PowerLock`` to disable power control of selected outputs (#21081)
-- Command ``Wifi 5`` to enable 11ax on ESP32 Core3
+- Command ``Wifi 6`` to enable 11ax on ESP32 Core3
 
 ### Breaking Changed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e86e13264..f07afe249 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -118,7 +118,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 ## Changelog v13.4.0.4
 ### Added
-- Command ``Wifi 5`` to enable 11ax on ESP32 Core3
+- Command ``Wifi 6`` to enable 11ax on ESP32 Core3
 - Command ``PowerLock`` to disable power control of selected outputs [#21081](https://github.com/arendst/Tasmota/issues/21081)
 - Support for calculated heat index if temperature and humidity is available with ``#define USE_HEAT_INDEX`` [#4771](https://github.com/arendst/Tasmota/issues/4771)
 - Support for LoRa and single channel EU863-870 LoRaWanBridge [#17790](https://github.com/arendst/Tasmota/issues/17790)
diff --git a/tasmota/tasmota_support/support_command.ino b/tasmota/tasmota_support/support_command.ino
index aa16c3c9b..2863ef1cf 100644
--- a/tasmota/tasmota_support/support_command.ino
+++ b/tasmota/tasmota_support/support_command.ino
@@ -2692,34 +2692,44 @@ void CmndWifiPower(void) {
 }
 
 void CmndWifi(void) {
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    Settings->flag4.network_wifi = XdrvMailbox.payload;
-    if (Settings->flag4.network_wifi) {
+  // Wifi    - Show current state
+  // Wifi 0  - Off
+  // Wifi 1  - On
+  // Wifi 2  - B
+  // Wifi 3  - BG
+  // Wifi 4  - BGN
+  // Wifi 6  - BGNAX
+  uint32_t option = XdrvMailbox.payload -1;
+  switch (XdrvMailbox.payload) {
+    case 0:  // Wifi 0 = Off
+    case 1:  // Wifi 1 = On
+      {
+        Settings->flag4.network_wifi = XdrvMailbox.payload;
+        if (Settings->flag4.network_wifi) {
 #ifdef ESP32
-      WifiConnect();
-#else
-      WifiEnable();
-#endif
-    }
-  } else if ((XdrvMailbox.payload >= 2) &&
+          WifiConnect();
+#else   // ESP8266
+          WifiEnable();
+#endif  // ESP32
+        }
+        break;
+      }
 #ifdef ESP32
 #if ESP_IDF_VERSION_MAJOR >= 5
-             (XdrvMailbox.payload <= 5)
-#else   // ESP_IDF_VERSION_MAJOR < 5
-             (XdrvMailbox.payload <= 4)
+    case 6:  // Wifi 6 = BGNAX
+      option = 4;
 #endif  // ESP_IDF_VERSION_MAJOR
-#else   // ESP8266
-             (XdrvMailbox.payload <= 4)
 #endif  // ESP32/ESP8266
-            ) {
-    // Wifi 2 = B
-    // Wifi 3 = BG
-    // Wifi 4 = BGN
-    // Wifi 5 = BGNAX
+    case 4:  // Wifi 4 = BGN
+    case 3:  // Wifi 3 = BG
+    case 2:  // Wifi 2 = B
+      {
 #ifdef ESP32
-    Wifi.phy_mode = XdrvMailbox.payload - 1;
-#endif
-    WiFi.setPhyMode(WiFiPhyMode_t(XdrvMailbox.payload - 1));  // 1-B/2-BG/3-BGN/4-BGNAX
+        Wifi.phy_mode = option;
+#endif  // ESP32
+        WiFi.setPhyMode(WiFiPhyMode_t(option));  // 1=B/2=BG/3=BGN/4=BGNAX
+        break;
+      }
   }
   Response_P(PSTR("{\"" D_JSON_WIFI "\":\"%s\",\"" D_JSON_WIFI_MODE "\":\"%s\"}"), 
     GetStateText(Settings->flag4.network_wifi), WifiGetPhyMode().c_str());