diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 2ca5d22cb87..d653620ca24 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -36,6 +36,7 @@ bridge_interface() {(
 
 
 wifi_updown() {
+	[ enable = "$1" ] && wifi_updown disable "$2"
 	for device in ${2:-$DEVICES}; do (
 	        config_get disabled "$device" disabled
 	        [ 1 == "$disabled" ] && {
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 46f994ea74c..222e2a9ddd4 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -73,7 +73,6 @@ enable_atheros() {
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
 	
-	disable_atheros "$device"
 	local first=1
 	for vif in $vifs; do
 		nosbeacon=