diff --git a/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun b/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun
index 5d13eaecc..791c73fe6 100644
--- a/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun
+++ b/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun
@@ -11,7 +11,7 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-if [ "$(uci -q get network.glorytun)" = "" ]; then
+if [ "$(uci -q get network.glorytun)" = "" ] && [ "$(uci -q get network.omrvpn)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		delete network.glorytun
 		set network.glorytun=interface
@@ -29,15 +29,15 @@ if [ "$(uci -q get network.glorytun)" = "" ]; then
 #	set network.glorytun.gateway=10.0.0.1
 fi
 
-if [ "$(uci -q show firewall | grep glorytun)" = "" ]; then
+if [ "$(uci -q show firewall | grep glorytun)" = "" ] && [ "$(uci -q get network.omrvpn)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
-		add firewall zone
-		set firewall.@zone[-1].name=vpn
-		set firewall.@zone[-1].network=glorytun
-		set firewall.@zone[-1].masq=1
-		set firewall.@zone[-1].input=REJECT
-		set firewall.@zone[-1].forward=ACCEPT
-		set firewall.@zone[-1].output=ACCEPT
+		set firewall.zone_vpn=zone
+		set firewall.zone_vpn.name=vpn
+		set firewall.zone_vpn.network=glorytun
+		set firewall.zone_vpn.masq=1
+		set firewall.zone_vpn.input=REJECT
+		set firewall.zone_vpn.forward=ACCEPT
+		set firewall.zone_vpn.output=ACCEPT
 		commit firewall
 	EOF
 fi