diff --git a/map-agent/files/lib/multiap/map_genconfig b/map-agent/files/lib/multiap/map_genconfig
index 366110663..38e0ab5e8 100644
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -5,8 +5,8 @@
 generate_mapagent_config=0
 generate_wireless_sta_config=0
 
-network_mode="$(fw_printenv -n netmode)"
-multiap_mode="$(fw_printenv -n multiap_mode)"
+network_mode="$(fw_printenv -n netmode)" # default is layer3
+multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
 
 is_airoha() {
 	[ -f /proc/device-tree/compatible ] || return
@@ -175,16 +175,15 @@ map_genconf () {
 		elif [ "$multiap_mode" == "auto" ]; then
 			uci -q set mapagent.@controller_select[0].autostart=1
 			uci -q set mapagent.@controller_select[0].local=0
-		elif [ "$multiap_mode" == "full" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=1
-			uci -q set mapagent.@controller_select[0].local=1
 		elif [ "$multiap_mode" == "none" ]; then
 			uci set mapagent.agent.enabled="0"
+		else # default to full
+			uci -q set mapagent.@controller_select[0].autostart=1
+			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