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 94f4ee576..a57a16b69 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -191,7 +191,8 @@ del_server_route() {
 
 disable_pihole() {
 	local server=$1
-	if [ "$(uci -q get openmptcprouter.${server}.pihole)" = "1" ]; then
+	if [ "$(uci -q get openmptcprouter.${server}.pihole)" = "1" ] && [ "$(uci -q  get dhcp.@dnsmasq[0].server)" != "127.0.0.1#5353" ]; then
+		_log "Disable Pi-Hole..."
 		uci -q batch <<-EOF >/dev/null
 			set dhcp.@dnsmasq[0].server='127.0.0.1#5353'
 			commit dhcp
@@ -203,7 +204,7 @@ disable_pihole() {
 enable_pihole() {
 	local server=$1
 	if [ "$(uci -q get openmptcprouter.${server}.pihole)" = "1" ] && [ "$(uci -q get dhcp.@dnsmasq[0].server)" = "127.0.0.1#5353" ]; then
-		_log "Restart openmptcprouter-vps..."
+		_log "Enable Pi-Hole..."
 		/etc/init.d/openmptcprouter-vps set_pihole
 	fi
 }
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 76d115716..c72cdd223 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -719,7 +719,7 @@ _config_service() {
 	[ -z "$(_set_redirect_ports_from_vps $redirect_port)" ] && error=1
 	[ -z "$(_set_mptcp_vps)" ] && error=1
 	[ -z "$(_set_vpn_vps)" ] && error=1
-	_set_pihole
+	#_set_pihole
 	[ -n "$wanips" ] && _set_wan_ip
 	[ "$error" = 0 ] && uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
 	uci -q batch <<-EOF >/dev/null