diff --git a/apps/registry-portal/src/pages/Radar.tsx b/apps/registry-portal/src/pages/Radar.tsx
index b91c26c..10c10ab 100644
--- a/apps/registry-portal/src/pages/Radar.tsx
+++ b/apps/registry-portal/src/pages/Radar.tsx
@@ -46,12 +46,18 @@ function formatAgentName(agentId: string | null | undefined): string {
       return knownAgents[hostname];
     }
 
-    // For JWKS URLs like api.openbotauth.org/jwks/username.json, extract username
+    // For user JWKS URLs like /jwks/username.json, extract username
     const jwksMatch = url.pathname.match(/\/jwks\/([^.]+)\.json$/);
     if (jwksMatch) {
       return jwksMatch[1];
     }
 
+    // For agent JWKS URLs like /agent-jwks/{uuid}, extract agent ID
+    const agentJwksMatch = url.pathname.match(/\/agent-jwks\/([^/]+)$/);
+    if (agentJwksMatch) {
+      return agentJwksMatch[1].slice(0, 8) + '…';
+    }
+
     // Return hostname for other URLs
     return hostname;
   } catch {