diff --git a/Changes b/Changes
index 40352c55..3f8e1cb3 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,10 @@
   * #324 use a (better) host group for internal localnet filter
   * #325 significant speed-up to Device > Ports tab (thx to T. Teräs)
 
+  [BUG FIXES]
+
+  * fix port neighbors being identified as macsuck_unsupported
+
 2.036005 - 2017-07-05
 
   [ENHANCEMENTS]
diff --git a/lib/App/Netdisco/Core/Macsuck.pm b/lib/App/Netdisco/Core/Macsuck.pm
index 8f985e84..8d9c20e6 100644
--- a/lib/App/Netdisco/Core/Macsuck.pm
+++ b/lib/App/Netdisco/Core/Macsuck.pm
@@ -368,7 +368,7 @@ sub _walk_fwtable {
       # do not expose MAC address tables via SNMP. relies on prefetched
       # neighbors otherwise it would kill the DB with device lookups.
       my $neigh_cannot_macsuck = eval { # can fail
-          check_acl_no($device_port->neighbor, 'macsuck_unsupported') ||
+          check_acl_no(($device_port->neighbor || "0 but true"), 'macsuck_unsupported') ||
           match_devicetype($device_port->remote_type, 'macsuck_unsupported_type') };
 
       if ($device_port->is_uplink) {