diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index f42bd3b46..ce59b5f82 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -191,6 +191,7 @@ disable_pihole() {
 			set dhcp.@dnsmasq[0].server='127.0.0.1#5353'
 			commit dhcp
 		EOF
+		/etc/init.d/dnsmasq restart
 	fi
 }
 
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index b30f2fd26..e3dc5d9a1 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -271,14 +271,17 @@ set_pihole() {
 	[ -z "$vps_config" ] && vps_config=$(_get_json "config")
 	[ -z "$vps_config" ] && return
 	vpn="$(uci -q get openmptcprouter.settings.vpn)"
+	piholeomr="$(uci -q get openmptcprouter.${servername}.pihole)"
 	pihole="$(echo "$vps_config" | jsonfilter -q -e '@.pihole.state')"
-	if [ "$pihole" = "true" ]; then
+	if [ "$pihole" = "true" ] && [ "$piholeomr" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.pihole='1'
+			commit openmptcprouter
 		EOF
-	else
+	elif [ "$piholeomr" != "0" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.pihole='0'
+			commit openmptcprouter
 		EOF
 	fi
 
diff --git a/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd b/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd
index 01c526085..7ae484cfa 100755
--- a/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd
+++ b/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd
@@ -3,6 +3,6 @@ uci -q batch <<-EOF >/dev/null
 	set uhttpd.main.redirect_https=0
 	set uhttpd.main.script_timeout=240
 	set uhttpd.main.network_timeout=240
-	set uhttpd.main.http_keepalive=60
+	set uhttpd.main.http_keepalive=120
 EOF
 exit 0
\ No newline at end of file