diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker
index 0c1d99fd8..326a2a560 100755
--- a/omr-tracker/files/etc/config/omr-tracker
+++ b/omr-tracker/files/etc/config/omr-tracker
@@ -14,7 +14,7 @@ config defaults 'defaults'
 	list hosts '199.85.126.30'
 	list hosts '119.29.29.29'
 	list hosts '182.254.118.118'
-        list hosts6 '2606:4700:4700::1111'
+    list hosts6 '2606:4700:4700::1111'
 	list hosts6 '2606:4700:4700::1001'
 	list hosts6 '2620:fe::fe'
 	list hosts6 '2620:fe::9'
@@ -40,7 +40,7 @@ config proxy 'proxy'
 	list hosts '1.1.1.1'
 	list hosts '74.82.42.42'
 	list hosts '176.103.130.130'
-        list hosts '125.39.174.154'
+    list hosts '125.39.174.154'
 	list hosts '42.236.94.154'
 	list hosts '113.207.102.154'
 	list hosts '180.163.188.24'
diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
index 21efcdfee..3c56a22c5 100755
--- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
+++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
@@ -14,6 +14,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 	if [ "$(uci -q show dhcp | grep 127.0.0.1#5353)" = "" ]; then
 		uci -q batch <<-EOF >/dev/null
 			add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353"
+			add_list dhcp.@dnsmasq[-1].server='8.8.8.8'
 			add_list dhcp.@dnsmasq[-1].server="/lan/"
 			set dhcp.@dnsmasq[-1].dnssec='1'
 			commit dhcp