diff --git a/frontend/packages/swarm-ui/src/pages/broadcast/BroadcastComposer.tsx b/frontend/packages/swarm-ui/src/pages/broadcast/BroadcastComposer.tsx
index 359d8643..9d20e691 100644
--- a/frontend/packages/swarm-ui/src/pages/broadcast/BroadcastComposer.tsx
+++ b/frontend/packages/swarm-ui/src/pages/broadcast/BroadcastComposer.tsx
@@ -208,9 +208,9 @@ export function BroadcastComposer() {
           />
         </div>
 
-        {agents === null ? (
+        {agents === null && !loadError ? (
           <RosterSkeleton />
-        ) : shown.length === 0 ? (
+        ) : agents !== null && shown.length === 0 ? (
           <EmptyState centered>
             {filter === "running" && all.length > 0
               ? "no agent is running right now. Show all to pick a stopped one."