diff --git a/includes/html/pages/device/routing/bgp.inc.php b/includes/html/pages/device/routing/bgp.inc.php
index dbccd757a5..8c0de12e9f 100644
--- a/includes/html/pages/device/routing/bgp.inc.php
+++ b/includes/html/pages/device/routing/bgp.inc.php
@@ -174,8 +174,8 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? $extra_sql
         unset($peerhost);
     }
 
-    $peerhost = cleanPort($peerhost);
     if (is_array($peerhost)) {
+        $peerhost = cleanPort($peerhost);
         // $peername = generate_device_link($peerhost);
         $peername = generate_device_link($peerhost) . ' ' . generate_port_link($peerhost);
         $peer_url = 'device/device=' . $peer['device_id'] . '/tab=routing/proto=bgp/view=updates/';
diff --git a/includes/rewrites.php b/includes/rewrites.php
index fd608fd5a9..e305afb0b1 100644
--- a/includes/rewrites.php
+++ b/includes/rewrites.php
@@ -39,6 +39,9 @@ function rewrite_entity_descr($descr)
  */
 function cleanPort($interface, $device = null)
 {
+    if (! $interface) {
+        return $interface;
+    }
     $interface['ifAlias'] = \LibreNMS\Util\Clean::html($interface['ifAlias'], []);
     $interface['ifName'] = \LibreNMS\Util\Clean::html($interface['ifName'], []);
     $interface['ifDescr'] = \LibreNMS\Util\Clean::html($interface['ifDescr'], []);