diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index cb31d6d04..3a49a2514 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -960,7 +960,7 @@ function system_arp_wrong_if()
     ));
 }
 
-function get_possible_listen_ips($include_ipv6_link_local = false)
+function get_possible_listen_ips()
 {
     global $config;
 
@@ -982,13 +982,12 @@ function get_possible_listen_ips($include_ipv6_link_local = false)
         $tmp["name"]  = $ifacename;
         $tmp["value"] = $iface;
         $listenips[] = $tmp;
-        if ($include_ipv6_link_local) {
-            $llip = find_interface_ipv6_ll(get_real_interface($iface, 'inet6'));
-            if (!empty($llip)) {
-                $tmp["name"]  = "{$ifacename} IPv6 Link-Local";
-                $tmp["value"] = $llip;
-                $listenips[] = $tmp;
-            }
+
+        $llip = find_interface_ipv6_ll(get_real_interface($iface, 'inet6'));
+        if (!empty($llip)) {
+            $tmp['name']  = "{$ifacename} IPv6 Link-Local";
+            $tmp['value'] = $llip;
+            $listenips[] = $tmp;
         }
     }
 
diff --git a/src/www/diag_testport.php b/src/www/diag_testport.php
index f56f0ed2e..9561275b3 100644
--- a/src/www/diag_testport.php
+++ b/src/www/diag_testport.php
@@ -187,13 +187,11 @@ include("head.inc"); ?>
                       <td>
                           <select name="sourceip" class="selectpicker" data-size="5" data-live-search="true">
                             <option value=""><?= gettext('Any') ?></option>
-<?php
-                          foreach (get_possible_listen_ips(true) as $sip):?>
+<?php foreach (get_possible_listen_ips() as $sip): ?>
                             <option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $sourceip) ? "selected=\"selected\"" : "";?>>
                               <?=htmlspecialchars($sip['name']);?>
                             </option>
-<?php
-                          endforeach;?>
+<?php endforeach ?>
                           </select>
                         </td>
                     </tr>
diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php
index 55cedbccb..ae0b9c6e7 100644
--- a/src/www/diag_traceroute.php
+++ b/src/www/diag_traceroute.php
@@ -128,13 +128,11 @@ include("head.inc");
                       <td>
                         <select name="sourceip" class="selectpicker">
                           <option value=""><?= gettext('Any') ?></option>
-<?php
-                        foreach (get_possible_listen_ips(true) as $sip):?>
+<?php foreach (get_possible_listen_ips() as $sip): ?>
                           <option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $pconfig['sourceip']) ? "selected=\"selected\"" : "";?>>
                             <?=htmlspecialchars($sip['name']);?>
                           </option>
-<?php
-                        endforeach; ?>
+<?php endforeach ?>
                         </select>
                       </td>
                     </tr>