diff --git a/src/app/(dashboard)/agents/page.tsx b/src/app/(dashboard)/agents/page.tsx
index 6a5a251..7fbef06 100644
--- a/src/app/(dashboard)/agents/page.tsx
+++ b/src/app/(dashboard)/agents/page.tsx
@@ -175,11 +175,10 @@ export default function AgentsPage() {
                 .filter(loc => agents.some(a => (a.uuid || a.serial) === loc.agent_uuid))
                 .map(loc => {
                   const agent = agents.find(a => (a.uuid || a.serial) === loc.agent_uuid);
+                  const dynamicLabel = resolveAgentLabel(loc.agent_uuid, managedUsers);
                   const agentLabel = agent
-                    ? (resolveAgentLabel(loc.agent_uuid, managedUsers) !== loc.agent_uuid
-                        ? resolveAgentLabel(loc.agent_uuid, managedUsers)
-                        : (agent.label || loc.label || loc.agent_uuid))
-                    : (loc.label || loc.agent_uuid);
+                    ? (agent.label || (dynamicLabel !== loc.agent_uuid ? dynamicLabel : loc.agent_uuid))
+                    : (loc.label || (dynamicLabel !== loc.agent_uuid ? dynamicLabel : loc.agent_uuid));
                   const isOnline = !!(agent?.last_seen_at?.human === 'Online' ||
                                      agent?.last_seen_at?.human === 'Flows Detected' ||
                                      (agent?.last_seen_at?.human && agent.last_seen_at.human.startsWith('Last seen:')));