diff --git a/messages/en.json b/messages/en.json
index fcb57d7..30a603d 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1830,6 +1830,8 @@
     "tabPipelines": "Pipelines",
     "tabFleet": "Fleet",
     "selectAgent": "Select agent...",
+    "noAgentsRegistered": "No agents registered",
+    "noSessionSuffix": "no session",
     "commandPlaceholder": "Send command or message to agent...",
     "send": "Send",
     "noTemplates": "No workflow templates yet",
diff --git a/src/components/panels/orchestration-bar.tsx b/src/components/panels/orchestration-bar.tsx
index 116605e..4044d0a 100644
--- a/src/components/panels/orchestration-bar.tsx
+++ b/src/components/panels/orchestration-bar.tsx
@@ -268,9 +268,12 @@ export function OrchestrationBar() {
               className="h-9 px-2 rounded-md bg-secondary border border-border text-sm text-foreground min-w-[140px]"
             >
               <option value="">{t('selectAgent')}</option>
-              {agents.filter(a => a.session_key).map(a => (
-                <option key={a.name} value={a.name}>
-                  {a.name} ({a.status})
+              {agents.length === 0 && (
+                <option value="" disabled>{t('noAgentsRegistered')}</option>
+              )}
+              {agents.map(a => (
+                <option key={a.name} value={a.name} disabled={!a.session_key} title={!a.session_key ? 'Agent has no active session' : undefined}>
+                  {a.name} ({a.status}){!a.session_key ? ` — ${t('noSessionSuffix')}` : ''}
                 </option>
               ))}
             </select>