diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index 28f19bda0..b571574d9 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -12,7 +12,6 @@ if [ "$(uci -q get network.omrvpn)" = "" ]; then
 		set network.omrvpn.leasetime=12h
 		set network.omrvpn.type=tunnel
 		set network.omrvpn.txqueuelen=100
-		set network.omrvpn.metric=9000
 		commit network
 	EOF
 fi
@@ -146,9 +145,11 @@ if [ "$(uci -q get glorytun-udp.vpn.key)" = "" ] && [ "$(uci -q get glorytun.vpn
 	uci -q commit glorytun-udp
 fi
 
-if [ "$(uci -q get network.omrvpn.metric)" = "1200" ]; then
+if [ "$(uci -q get network.tun0.metric)" = "1200" ] || [ -z "$(uci -q get network.tun0.metric)" ]; then
 	uci -q batch <<-EOF >/dev/null
-		set network.omrvpn.metric=9000
+		set network.tun0=device
+		set network.tun0.name='tun0'
+		set network.tun0.metric=9000
 		commit network
 	EOF
 fi
diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
index 6d3a09a12..c8d7c8e27 100755
--- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
+++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
@@ -81,7 +81,7 @@ if [ "$(uci -q get sqm.omrvpn)" = "" ] || [ -z "$(uci -q get sqm.omrvpn.delay_th
 		set sqm.omrvpn.script="piece_of_cake.qos"
 		set sqm.omrvpn.qdisc_advanced='0'
 		set sqm.omrvpn.linklayer='none'
-		set sqm.omrvpn.enabled='1'
+		set sqm.omrvpn.enabled='0'
 		set sqm.omrvpn.interface=tun0
 		set sqm.omrvpn.download='0'
 		set sqm.omrvpn.upload='0'
@@ -91,12 +91,6 @@ if [ "$(uci -q get sqm.omrvpn)" = "" ] || [ -z "$(uci -q get sqm.omrvpn.delay_th
 		set sqm.omrvpn.iqdisc_opts='autorate-ingress'
 		set sqm.omrvpn.delay_thr_ms='300'
 		set sqm.omrvpn.reflector_ping_interval_s='0.5'
-		set sqm.omrvpn.download='20000'
-		set sqm.omrvpn.min_download='1000'
-		set sqm.omrvpn.max_download='60000'
-		set sqm.omrvpn.upload='20000'
-		set sqm.omrvpn.min_upload='1000'
-		set sqm.omrvpn.max_upload='60000'
 		set sqm.omrvpn.enable_sleep_function='0'
 		set sqm.omrvpn.autorate='1'
 		commit sqm