diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 2a8465b9fd..a22b5c4adc 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -130,6 +130,7 @@ enable_atheros() {
 			config_set "$vif" bridge "$bridge"
 			start_net "$ifname" "$net_cfg"
 		}
+		iwconfig "$ifname" essid "$ssid"
 		case "$mode" in
 			ap)
 				hostapd_setup_vif "$vif" madwifi || {
@@ -141,7 +142,6 @@ enable_atheros() {
 				}
 			;;
 			wds|sta)
-				iwconfig "$ifname" essid "$ssid"
 				# FIXME: implement wpa_supplicant calls here
 			;;
 		esac