diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index ab2163dd5..7e0747350 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -20,11 +20,11 @@ while true; do
 		iface=$(uci -q get openvpn.omr.dev)
 	fi
 	[ -z "$addr" ] && addr=$(ubus call network.interface.omrvpn status | jsonfilter -q -e '@["ipv4-address"][0].address' | tr -d "\n")
-	if [ -n "$iface" ] && [ -d "/sys/class/net/$iface" ]; then
-		[ -z "$addr" ] && [ -n "$iface" ] && addr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
+	if [ -n "$iface" ] && [ -d "/sys/class/net/$iface" ] && [ "$(uci -q get openmptcprouter.omrvpn.state)" = "up" ]; then
+		[ -z "$addr" ] && [ -n "$iface" ] && addr=$(ip -4 addr show dev "$iface" | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
 		[ -z "$peer" ] && peer=$(ubus call network.interface.omrvpn status | jsonfilter -q -l 1 -e '@.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
-		[ -z "$peer" ] && peer=$(ip -4 r list dev $iface | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
-		[ -z "$peer" ] && peer=$(ip -4 r list dev $iface | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d "\n")
+		[ -z "$peer" ] && peer=$(ip -4 r list dev "$iface" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
+		[ -z "$peer" ] && peer=$(ip -4 r list dev "$iface" | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d "\n")
 		[ -n "$addr" ] && [ -n "$peer" ] && {
 			#logger -t "omr6in4" "addr: $addr - peer: $peer"
 			if [ "$addr" != "$(uci -q get network.omr6in4.ipaddr)" ] || [ "$peer" != "$(uci -q get network.omr6in4.peeraddr)" ] || [ "$(ip -6 route show default dev 6in4-omr6in4 metric 1 | grep via)" = "" ]; then
@@ -36,7 +36,7 @@ while true; do
 					commit network
 				EOF
 				if [ -n "$(ip tunnel | grep omr6in4)" ]; then
-					ip tunnel change "6in4-omr6in4" mode sit local ${addr} remote ${peer} ttl 64 > /dev/null 2>&1
+					ip tunnel change "6in4-omr6in4" mode sit local "${addr}" remote "${peer}" ttl 64 > /dev/null 2>&1
 				else
 					ifup omr6in4 > /dev/null 2>&1
 				fi
@@ -44,25 +44,27 @@ while true; do
 				#ipv6_addr=$(ip -6 addr show dev 6in4-omr6in4 | grep inet | awk '{print $2'} | cut -d/ -f1 | tr -d "\n")
 				#ipv6_gw=$(echo $ipv6_addr | sed 's/1$/2')
 				ipv6_addr=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@["ipv6-address"][0].address' | tr -d "\n")
-				ip -6 addr add $ipv6_addr dev 6in4-omr6in4 > /dev/null 2>&1
+				ip -6 addr add "$ipv6_addr" dev 6in4-omr6in4 > /dev/null 2>&1
 				ipv6_gw=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n")
 				[ "$ipv6_gw" = "::" ] && ipv6_gw='fe80::a00:1'
 				[ -z "$ipv6_gw" ] && ipv6_gw='fe80::a00:1'
 				#[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01'
-				ip -6 route add ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1
+				ip -6 route add "${ipv6_gw}" dev 6in4-omr6in4 > /dev/null 2>&1
 				ip -6 route 2002::/16 dev 6in4-omr6in4 > /dev/null 2>&1
-				ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 metric 1 > /dev/null 2>&1
+				ip -6 route replace default via "${ipv6_gw}" dev 6in4-omr6in4 metric 1 > /dev/null 2>&1
 				if [ "$(uci -q get openmptcprouter.settings.uci_route)" = "1" ]; then
 					uci -q batch <<-EOF
 						set network.omr6in4_route6_default=route6
 						set network.omr6in4_route6_default.interface=omr6in4
 						set network.omr6in4_route6_default.target='::'
-						set network.omr6in4_route6_default.gateway=$ipv6_gw
+						set network.omr6in4_route6_default.gateway="$ipv6_gw"
 						commit network
 					EOF
 				fi
 			fi
 		}
+	else
+		ifdown omr6in4 > /dev/null 2>&1
 	fi
 	sleep 10
 done
\ No newline at end of file