diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index c795cedb2..4e035fdf8 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -49,8 +49,6 @@ function validate_partial_mac_list($maclist)
 function reconfigure_dhcpd()
 {
     system_resolver_configure();
-    plugins_configure('dns');
-    clear_subsystem_dirty('hosts');
     dhcpd_dhcp4_configure();
     clear_subsystem_dirty('staticmaps');
 }
@@ -439,8 +437,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             unset($config['dhcpd'][$if]['staticmap'][$_POST['id']]);
             write_config();
             if (isset($config['dhcpd'][$if]['enable'])) {
-              mark_subsystem_dirty('staticmaps');
-              mark_subsystem_dirty('hosts');
+                mark_subsystem_dirty('staticmaps');
             }
         }
         header(url_safe('Location: /services_dhcp.php?if=%s', array($if)));
diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php
index e2c75a2e3..6f05b56f8 100644
--- a/src/www/services_dhcp_edit.php
+++ b/src/www/services_dhcp_edit.php
@@ -250,7 +250,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
         if (isset($config['dhcpd'][$if]['enable'])) {
             mark_subsystem_dirty('staticmaps');
-            mark_subsystem_dirty('hosts');
         }
 
         header(url_safe('Location: /services_dhcp.php?if=%s', array($if)));
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index 761e9637e..7222dab37 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -37,10 +37,8 @@ require_once("plugins.inc.d/dhcpd.inc");
 function reconfigure_dhcpd()
 {
     system_resolver_configure();
-    plugins_configure('dns');
-    clear_subsystem_dirty('hosts');
     dhcpd_dhcp6_configure();
-    clear_subsystem_dirty('staticmaps');
+    clear_subsystem_dirty('staticmapsv6');
 }
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
@@ -325,7 +323,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             write_config();
             if (isset($config['dhcpdv6'][$if]['enable'])) {
                 mark_subsystem_dirty('staticmapsv6');
-                mark_subsystem_dirty('hosts');
             }
         }
         exit;
@@ -420,7 +417,7 @@ include("head.inc");
       <div class="row">
         <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
         <?php if (isset($savemsg)) print_info_box($savemsg); ?>
-        <?php if (is_subsystem_dirty('staticmaps')): ?><p>
+        <?php if (is_subsystem_dirty('staticmapsv6')): ?><p>
         <?php print_info_box_apply(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
         <?php endif; ?>
         <section class="col-xs-12">
diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php
index e05272650..b7fe8cb0b 100644
--- a/src/www/services_dhcpv6_edit.php
+++ b/src/www/services_dhcpv6_edit.php
@@ -141,8 +141,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         write_config();
 
         if (isset($config['dhcpdv6'][$if]['enable'])) {
-            mark_subsystem_dirty('staticmaps');
-            mark_subsystem_dirty('hosts');
+            mark_subsystem_dirty('staticmapsv6');
         }
 
         header(url_safe('Location: /services_dhcpv6.php?if=%s', array($if)));