diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
index 2e53a946a..0ea9123d4 100644
--- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
+++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
@@ -23,7 +23,7 @@ o.default     = "2"
 o.datatype    = "range(1, 100)"
 o.rmempty     = false
 
-o = s:option(ListValue, "type", translate("Type"), translate("Always ping gateway, then test connection by ping or dns. None mode only ping gateway"))
+o = s:option(ListValue, "type", translate("Type"), translate("Always ping gateway, then test connection by ping or dns. None mode only ping gateway."))
 o:value("ping","ping")
 o:value("dns","dns")
 o:value("none","none")
diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index a7df23b89..204c322b6 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -57,7 +57,8 @@ interface_multipath_settings() {
 	else
 		network_get_ipaddr $config ipaddr
 		ipaddr=	$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
-		gateway=$(ip -4 r list dev $iface | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
+		gateway=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
+		[ -z "$gateway" ] && gateway=$(ubus call network.interface.wan1 status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n")
 		netmask=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f2 | tr -d "\n")
 		network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'`
 	fi
diff --git a/omr-tracker/Makefile b/omr-tracker/Makefile
index 2394fbe3e..0bf89bc13 100644
--- a/omr-tracker/Makefile
+++ b/omr-tracker/Makefile
@@ -19,6 +19,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Network
   TITLE:=OpenMPTCProuter tracker
   PKGARCH:=all
+  DEPENDS:=+bind-dig
 endef
 
 define Package/$(PKG_NAME)/description
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 9b399ccbe..89825b689 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -128,6 +128,9 @@ while true; do
 		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 			OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
 		fi
+		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.wan1 status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n")
+		fi
 
 		# execute specific tracker
 		if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then