diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
index 2f6c4ddc40..f7eaa2741d 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
@@ -478,7 +478,7 @@ function generate(config) {
 	device_rates(config);
 
 	/* beacon */
-	append_vars(config, [ 'beacon_int', 'beacon_rate', 'rnr_beacon', 'mbssid'  ]);
+	append_vars(config, [ 'beacon_int', 'beacon_rate', 'rnr_beacon' ]);
 
 	/* wpa_supplicant co-exist */
 	append_vars(config, [ 'noscan' ]);
@@ -510,6 +510,9 @@ function generate(config) {
 	}
 	device_htmode_append(config);
 
+	if (config.ieee80211ax || config.ieee80211be)
+		append_vars(config, [ 'mbssid' ]);
+
 	/* 6G power mode */
 	if (config.band != '6g')
 		append_vars(config, [ 'reg_power_type' ]);