diff --git a/map-agent/files/lib/multiap/map_genconfig b/map-agent/files/lib/multiap/map_genconfig
index 6de00f6de..f413ea248 100644
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -188,12 +188,12 @@ map_genconf () {
 			uci -q set mapagent.@controller_select[0].local=1
 		fi
 		uci -q commit mapagent
-	fi
 
-	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
-		uci set mapcontroller.controller.enabled="0"
-	else
-		uci set mapcontroller.controller.enabled="1"
+		if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
+			uci set mapcontroller.controller.enabled="0"
+		else
+			uci set mapcontroller.controller.enabled="1"
+		fi
+		uci -q commit mapcontroller
 	fi
-	uci -q commit mapcontroller
 }