diff --git a/src/etc/inc/filter.lib.inc b/src/etc/inc/filter.lib.inc
index c6fdf7cd1..6700ad66c 100644
--- a/src/etc/inc/filter.lib.inc
+++ b/src/etc/inc/filter.lib.inc
@@ -80,10 +80,12 @@ function filter_core_antilockout_interface()
 {
     global $config;
     $lockoutif = null;
-    if (!empty($config['interfaces']['lan']['if'])) {
-        $lockoutif = 'lan';
-    } elseif (count(get_configured_interface_with_descr()) == 1 && !empty($config['interfaces']['wan']['if'])) {
-        $lockoutif = 'wan';
+    if (!isset($config['system']['webgui']['noantilockout'])) {
+        if (!empty($config['interfaces']['lan']['if'])) {
+            $lockoutif = 'lan';
+        } elseif (count(get_configured_interface_with_descr()) == 1 && !empty($config['interfaces']['wan']['if'])) {
+            $lockoutif = 'wan';
+        }
     }
     return $lockoutif;
 }
@@ -116,8 +118,8 @@ function filter_core_antilockout_ports()
             (!isset($config['system']['ssh']['noauto']) && is_install_media() && is_process_running('sshd'))) {
             $lockout_ports[] = empty($config['system']['ssh']['port']) ? "22" : $config['system']['ssh']['port'];
         }
+        sort($lockout_ports);
     }
-    sort($lockout_ports);
     return $lockout_ports;
 }
 
diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index 943f178fb..1c3534546 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -317,7 +317,7 @@ $( document ).ready(function() {
                   </tr>
                 </thead>
                 <tbody>
-<?php if (count($lockout_prts) &&!empty($lockout_intf) && !isset($config['system']['webgui']['noantilockout'])): ?>
+<?php if (count($lockout_prts) && !empty($lockout_intf)): ?>
                   <tr>
                     <td></td>
                     <td><i class="fa fa-exclamation fa-fw text-success"></i></td>
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index c6c14b5d5..4fea9257d 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -401,7 +401,7 @@ $( document ).ready(function() {
                   </tr>
 <?php
                 endif; ?>
-<?php if (count($lockout_prts) && !empty($lockout_intf) && !isset($config['system']['webgui']['noantilockout']) && $selected_if == $lockout_intf): ?>
+<?php if (count($lockout_prts) && !empty($lockout_intf) && $selected_if == $lockout_intf): ?>
                   <tr>
                     <td>&nbsp;</td>
                     <td><span class="fa fa-play text-success"></span></td>