diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 7e3139f2..729c99d3 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -179,6 +179,8 @@ SetQueryLogOptions(){
 
 ProcessDHCPSettings() {
 
+	if [[ "${DHCP_ACTIVE}" == "true" ]]; then
+
 	source "${setupVars}"
 	interface=$(grep 'PIHOLE_INTERFACE=' /etc/pihole/setupVars.conf | sed "s/.*=//")
 
@@ -211,6 +213,9 @@ dhcp-range=::100,::1ff,constructor:${interface},ra-names,slaac,${leasetime}
 ra-param=*,0,0
 " > "${dhcpconfig}"
 
+	else
+		rm "${dhcpconfig}"
+	fi
 }
 
 EnableDHCP(){
@@ -239,7 +244,7 @@ DisableDHCP(){
 	delete_dnsmasq_setting "dhcp-"
 	delete_dnsmasq_setting "quiet-dhcp"
 
-	rm "${dhcpconfig}"
+	ProcessDHCPSettings
 
 	RestartDNS
 }
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index c2c7f8d9..6711ecdf 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -892,9 +892,14 @@ finalExports() {
   # Look for DNS server settings which would have to be reapplied
   source "${setupVars}"
   source "/etc/.pihole/advanced/Scripts/webpage.sh"
+
   if [[ "${DNS_FQDN_REQUIRED}" != "" ]] ; then
     ProcessDNSSettings
   fi
+
+  if [[ "${DHCP_ACTIVE}" != "" ]] ; then
+    ProcessDHCPSettings
+  fi
 }
 
 installPihole() {