diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
index 9c05b826ad9..4a01c96bdbd 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
@@ -1233,7 +1233,7 @@
 			"default": true
 		},
 		"wps_label": {
-			"description": "Support WPS labels",
+			"description": "Support WPS labels. Ignored in the 6 GHz band, which has no WPS",
 			"type": "boolean"
 		},
 		"wps_manufacturer": {
@@ -1249,7 +1249,7 @@
 			"default": "ap_pin"
 		},
 		"wps_pushbutton": {
-			"description": "Support WPS pushbutton",
+			"description": "Support WPS pushbutton. Ignored in the 6 GHz band, which has no WPS",
 			"type": "boolean"
 		}
 	}
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
index 167dcd1e174..6ef526ba1b8 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
@@ -285,13 +285,16 @@ function iface_ppsk(config) {
 	append('macaddr_acl', '2');
 }
 
-function iface_wps(config) {
+function iface_wps(config, band) {
 	push_config(config, 'config_methods', 'wps_pushbutton', 'push_button');
 	push_config(config, 'config_methods', 'wps_label', 'label');
 
 	if (config.multi_ap == 1)
 		config.wps_possible = false;
 
+	if (band == '6g')
+		config.wps_possible = false;
+
 	if (config.wps_possible && length(config.config_methods)) {
 		config.eap_server = 1;
 		set_default(config, 'wps_state', 2);
@@ -631,7 +634,7 @@ export function generate(interface, data, config, vlans, stas, phy_features) {
 
 	iface_ppsk(config);
 
-	iface_wps(config);
+	iface_wps(config, data.config.band);
 
 	iface_rrm(config);