diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index ce295a3f1..62a180aa2 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -126,11 +126,6 @@ function filter_delete_states_for_down_gateways()
 {
     global $config, $GatewaysList;
 
-    if (isset($config['system']['kill_states'])) {
-        return;
-    }
-
-
     $any_gateway_down = false;
     $a_gateways = return_gateways_status();
     if (is_array($GatewaysList)) {
@@ -364,7 +359,9 @@ function filter_configure_sync()
     }
 
     update_filter_reload_status(gettext("Processing down interface states"));
-    filter_delete_states_for_down_gateways();
+    if (!isset($config['system']['kill_states'])) {
+        filter_delete_states_for_down_gateways();
+    }
 
     update_filter_reload_status(gettext("Done"));
     if (file_exists("/var/run/booting")) {
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index 439bb8dc5..50636ca7c 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -350,7 +350,7 @@ include("head.inc");
                   <td><a id="help_for_kill_states" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Kill states");?> </td>
                   <td>
                     <input name="kill_states" type="checkbox" id="kill_states" value="yes" <?= !empty($pconfig['kill_states']) ? "checked=\"checked\"" : "";?> />
-                    <strong><?=gettext("State Killing on Gateway Failure"); ?></strong>
+                    <strong><?=gettext("Disable State Killing on Gateway Failure"); ?></strong>
                     <div class="hidden" for="help_for_kill_states">
                       <?=gettext("The monitoring process will flush states for a gateway that goes down if this box is not checked. Check this box to disable this behavior."); ?>
                     </div>