diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
index f04d5fb61..9404637f6 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -227,6 +227,12 @@ _bypass_ip_set() {
 	_bypass_ip $ip $interface
 }
 
+_bypass_omr_server() {
+	local ip
+	config_get ip $1 ip
+	_bypass_ip $ip
+}
+
 boot() {
 	BOOT=1
 	start "$@"
@@ -262,6 +268,8 @@ start_service() {
 	config_foreach _intf_rule interface
 
 	local ndpi_rules=""
+	config_load openmptcprouter
+	config_foreach _bypass_omr_server server
 	config_load omr-bypass
 	config_foreach _bypass_ip_set ips
 	config_foreach _bypass_mac macs
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 5569eb983..90a7eb4db 100644
--- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
+++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
@@ -1,6 +1,5 @@
 local net = require "luci.model.network".init()
 local sys = require "luci.sys"
-local ifaces = sys.net:devices()
 local m, s, o
 
 m = Map("omr-tracker", translate("OMR-Tracker"))
@@ -86,9 +85,9 @@ s.template_addremove = "omr-tracker/cbi-select-add"
 s.addremove = true
 s.add_select_options = { }
 s.add_select_options[''] = ''
-for _, iface in ipairs(ifaces) do
-	if not (iface == "lo" or iface:match("^ifb.*")) then
-		s.add_select_options[iface] = iface
+for _, iface in ipairs(net:get_networks()) do
+	if not (iface:name() == "loopback") then
+		s.add_select_options[iface:name()] = iface:name()
 	end
 end