diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 713429875..bbe84dba6 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1785,7 +1785,7 @@ function interface_sync_wireless_clones(&$ifcfg, $sync_changes = false)
 
     $baseif = interface_get_wireless_base($ifcfg['if']);
 
-    foreach (get_configured_interface_with_descr(false, true) as $if => $unused) {
+    foreach (get_configured_interface_with_descr(true) as $if => $unused) {
         if ($baseif == interface_get_wireless_base($config['interfaces'][$if]['if']) && $ifcfg['if'] != $config['interfaces'][$if]['if']) {
             if (isset($config['interfaces'][$if]['wireless']['standard']) || $sync_changes) {
                 foreach ($shared_settings as $setting) {
@@ -3513,7 +3513,7 @@ function convert_friendly_interface_to_friendly_descr($interface)
                     }
                 }
             } else {
-                foreach (get_configured_interface_with_descr(false, true) as $if => $ifname) {
+                foreach (get_configured_interface_with_descr(true) as $if => $ifname) {
                     if ($if == $interface || $ifname == $interface) {
                         return $ifname;
                     }
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index a9460af9a..2f548a289 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -749,15 +749,11 @@ function get_configured_vips_list()
     return $alias_list;
 }
 
-function get_configured_interface_with_descr($only_opt = false, $withdisabled = false)
+function get_configured_interface_with_descr($withdisabled = false)
 {
     $iflist = array();
 
     foreach (legacy_config_get_interfaces(array('virtual' => false)) as $if => $ifdetail) {
-        if ($only_opt && ($if == 'wan' || $if == 'lan')) {
-            continue;
-        }
-
         if (isset($ifdetail['enable']) || $withdisabled == true) {
             $iflist[$if] = $ifdetail['descr'];
         }
diff --git a/src/opnsense/scripts/shell/banner.php b/src/opnsense/scripts/shell/banner.php
index 0b0c14de5..01b29bdf4 100755
--- a/src/opnsense/scripts/shell/banner.php
+++ b/src/opnsense/scripts/shell/banner.php
@@ -43,7 +43,7 @@ $product = $g['product_name'];
 
 echo "\n*** {$hostname}.{$domain}: {$product} {$version} ({$machine}/${flavour}) ***\n";
 
-$iflist = get_configured_interface_with_descr(false, true);
+$iflist = get_configured_interface_with_descr(true);
 
 if (empty($iflist)) {
     echo "\n\tNo network interfaces are assigned.\n";
diff --git a/src/opnsense/scripts/shell/setaddr.php b/src/opnsense/scripts/shell/setaddr.php
index ca3d3504c..4f5782221 100755
--- a/src/opnsense/scripts/shell/setaddr.php
+++ b/src/opnsense/scripts/shell/setaddr.php
@@ -135,7 +135,7 @@ function get_interface_config_description($iface)
 $fp = fopen('php://stdin', 'r');
 
 /* build an interface collection */
-$ifdescrs = get_configured_interface_with_descr(false, true);
+$ifdescrs = get_configured_interface_with_descr(true);
 $count = count($ifdescrs);
 
 /* grab interface that we will operate on, unless there is only one
diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php
index aa62834d3..a45995060 100644
--- a/src/www/firewall_virtual_ip.php
+++ b/src/www/firewall_virtual_ip.php
@@ -267,7 +267,7 @@ $main_buttons = array(
                 </thead>
                 <tbody>
 <?php
-                  $interfaces = get_configured_interface_with_descr(false, true);
+                  $interfaces = get_configured_interface_with_descr(true);
                   $interfaces['lo0'] = "Localhost";
                   $i = 0;
                   foreach ($a_vip as $vipent):
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index 3115a97e0..15520a030 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -333,7 +333,7 @@ $( document ).ready(function() {
                     <td>
                       <select name="interface" class="selectpicker" data-width="auto">
 <?php
-                      $interfaces = get_configured_interface_with_descr(false, true);
+                      $interfaces = get_configured_interface_with_descr(true);
                       $interfaces['lo0'] = "Localhost";
                       foreach ($interfaces as $iface => $ifacename): ?>
                         <option value="<?=$iface;?>" <?= $iface == $pconfig['interface'] ? "selected=\"selected\"" :""; ?>>
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index b427e240d..0fdc7d82d 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -309,17 +309,11 @@ function get_wireless_channel_info($interface) {
     return($wireless_channels);
 }
 
+$ifdescrs = get_configured_interface_with_descr(true);
 
-
-
-// Get configured interface list
-$ifdescrs = get_configured_interface_with_descr(false, true);
-
-// reference to interface section
 $a_interfaces = &config_read_array('interfaces');
 $a_ppps = &config_read_array('ppps', 'ppp');
 
-
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     if (!empty($_GET['if']) && !empty($a_interfaces[$_GET['if']])) {
         $if = $_GET['if'];
@@ -2889,7 +2883,7 @@ include("head.inc");
                           <td style="width:78%">
                             <select name='track6-interface' class='selectpicker' data-style='btn-default' >
 <?php
-                            foreach (get_configured_interface_with_descr(false, true) as $iface => $ifacename):
+                            foreach (get_configured_interface_with_descr(true) as $iface => $ifacename):
                               switch($config['interfaces'][$iface]['ipaddrv6']) {
                                 case '6rd':
                                 case '6to4':
diff --git a/src/www/interfaces_groups.php b/src/www/interfaces_groups.php
index 9315f31e9..1450626ff 100644
--- a/src/www/interfaces_groups.php
+++ b/src/www/interfaces_groups.php
@@ -119,7 +119,7 @@ $main_buttons = array(
                     </td>
                     <td>
 <?php
-                    $iflist = get_configured_interface_with_descr(false, true);
+                    $iflist = get_configured_interface_with_descr(true);
                     foreach (explode(" ", $ifgroupentry['members']) as $id => $memb):?>
                       <?=$id > 0 ? "," : "";?>
                       <?=!empty($iflist[$memb]) ? $iflist[$memb] : $memb;?>
diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index 67f87fb96..228c57bc7 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -33,7 +33,7 @@ function lagg_inuse($lagg_intf)
 {
     global $config;
 
-    foreach (get_configured_interface_with_descr(false, true) as $if => $unused) {
+    foreach (get_configured_interface_with_descr(true) as $if => $unused) {
         if ($config['interfaces'][$if]['if'] == $lagg_intf) {
             return true;
         }
diff --git a/src/www/interfaces_lagg_edit.php b/src/www/interfaces_lagg_edit.php
index 95426dd05..34e605a3c 100644
--- a/src/www/interfaces_lagg_edit.php
+++ b/src/www/interfaces_lagg_edit.php
@@ -42,7 +42,7 @@ function available_interfaces($selected_id=null)
     global $config;
     // configured interfaces
     $configured_interfaces = array();
-    foreach (get_configured_interface_with_descr(false, true) as $intf => $unused) {
+    foreach (get_configured_interface_with_descr(true) as $intf => $unused) {
         $configured_interfaces[] = get_real_interface($intf);
     }
     // lagg members from other lagg interfaces
diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 3fdebf2bb..7ce393528 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -33,7 +33,7 @@ function clone_inuse($cloneif)
 {
     global $config;
 
-    foreach (get_configured_interface_with_descr(false, true) as $if => $unused) {
+    foreach (get_configured_interface_with_descr(true) as $if => $unused) {
         if ($config['interfaces'][$if]['if'] == $cloneif) {
             return true;
         }
diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index d6ada2213..468c71a1d 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -70,7 +70,7 @@ include("head.inc");
             $pfctl_counters = json_decode(configd_run("filter list counters json"), true);
             $vmstat_interupts = json_decode(configd_run("system list interrupts json"), true);
             $ifsinfo = get_interfaces_info();
-            foreach (get_configured_interface_with_descr(false, true) as $ifdescr => $ifname):
+            foreach (get_configured_interface_with_descr(true) as $ifdescr => $ifname):
               $ifinfo = $ifsinfo[$ifdescr];
               $ifpfcounters = $pfctl_counters[$ifinfo['if']];
               legacy_html_escape_form_data($ifinfo);
diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php
index 4ff351ae7..defdd9ae3 100644
--- a/src/www/system_gateways_edit.php
+++ b/src/www/system_gateways_edit.php
@@ -583,7 +583,7 @@ $( document ).ready(function() {
                   <td>
                     <select name='interface' class="selectpicker" data-style="btn-default" data-live-search="true">
 <?php
-                    foreach (get_configured_interface_with_descr(false, true) as $iface => $ifacename):?>
+                    foreach (get_configured_interface_with_descr(true) as $iface => $ifacename):?>
                       <option value="<?=$iface;?>" <?=$iface == $pconfig['friendlyiface'] ? "selected='selected'" : "";?>>
                         <?=$ifacename;?>
                       </option>