diff --git a/applications/luci-app-ap-modem/Makefile b/applications/luci-app-ap-modem/Makefile
index f88e93b..557b182 100644
--- a/applications/luci-app-ap-modem/Makefile
+++ b/applications/luci-app-ap-modem/Makefile
@@ -1,7 +1,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.1-20230403
+PKG_VERSION:=1.0.2-20230405
 PKG_RELEASE:=
 PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>
 
diff --git a/applications/luci-app-ap-modem/root/etc/init.d/ap_modem b/applications/luci-app-ap-modem/root/etc/init.d/ap_modem
index 0a819db..98e9108 100755
--- a/applications/luci-app-ap-modem/root/etc/init.d/ap_modem
+++ b/applications/luci-app-ap-modem/root/etc/init.d/ap_modem
@@ -36,6 +36,11 @@ generate_config() {
         echo "network.lan.device != br-lan in uci" >&2
         return 1
     }
+    local wan_dev="`uci -q get network.wan.device`"
+    [[ -z "$wan_dev" ]] && {
+        echo "get network.wan.device in uci failed" >&2
+        return 1
+    }
     local lan_dev=`find_uci_section network device name 'br-lan' | head -1`
     [[ -z "$lan_dev" ]] && {
         echo "network.device.name=br-lan not found in uci" >&2
@@ -85,16 +90,20 @@ EOF
         uci -q batch <<-EOF >/dev/null
             set network.vap_wan=interface
             set network.vap_wan.proto=static
-            set network.vap_wan.device=@wan
+            set network.vap_wan.device=$wan_dev
             set network.vap_wan.defaultroute=0
             set network.vap_wan.delegate=0
 EOF
     fi
     # firewall
-    uci -q get "firewall.$wan_zone.network" | grep -Fwq 'vap_lan' || uci -q batch <<-EOF >/dev/null
+    local fw_wan_net="`uci -q get firewall.$wan_zone.network`"
+    echo "$fw_wan_net" | grep -Fwq 'vap_lan' || uci -q batch <<-EOF >/dev/null
         add_list firewall.$wan_zone.network=vap_lan
-        commit firewall
 EOF
+    echo "$fw_wan_net" | grep -Fwq 'vap_wan' || uci -q batch <<-EOF >/dev/null
+        add_list firewall.$wan_zone.network=vap_wan
+EOF
+    uci commit firewall
 
     # ip
     local bip