diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
index 39b0c5e1..9c92dd53 100644
--- a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
@@ -336,13 +336,6 @@ sub _walk_fwtable {
           next;
       }
 
-      # possibly move node to lag master
-      if (defined $device_port->slave_of
-            and exists $device_ports->{$device_port->slave_of}) {
-          $port = $device_port->slave_of;
-          $device_port = $device_ports->{$port};
-      }
-
       # check to see if the port is connected to another device
       # and if we have that device in the database.
 
@@ -390,6 +383,13 @@ sub _walk_fwtable {
           next unless setting('macsuck_bleed');
       }
 
+      # possibly move node to lag master
+      if (defined $device_port->slave_of
+            and exists $device_ports->{$device_port->slave_of}) {
+          $port = $device_port->slave_of;
+          $device_ports->{$port}->update({is_uplink => \'true'});
+      }
+
       my $vlan = $fw_vlan->{$idx} || $comm_vlan || '0';
       ++$cache->{$vlan}->{$port}->{$mac};
   }