diff --git a/src/components/room/DiscordMemberList.tsx b/src/components/room/DiscordMemberList.tsx
index ef983c2..f9491ac 100644
--- a/src/components/room/DiscordMemberList.tsx
+++ b/src/components/room/DiscordMemberList.tsx
@@ -171,7 +171,10 @@ export const DiscordMemberList = memo(function DiscordMemberList({
                 icon={<Bot className="h-3 w-3" />}
               >
                 {aiConfigs.map((ai) => {
-                  const label = ai.modelName || 'Unknown AI';
+                  // Fallback: try modelName, then short model ID (no provider prefix), then 'AI'
+                  const label = ai.modelName
+                    || ai.model?.split('/').pop()
+                    || 'AI';
                   return (
                     <button
                       key={ai.model}
diff --git a/src/components/room/message/MessageInput.tsx b/src/components/room/message/MessageInput.tsx
index a1a8aea..d74e908 100644
--- a/src/components/room/message/MessageInput.tsx
+++ b/src/components/room/message/MessageInput.tsx
@@ -147,7 +147,10 @@ export const MessageInput = forwardRef<MessageInputHandle, MessageInputProps>(fu
         channels: [] as { id: string; label: string; type: 'channel'; avatar?: string }[],
         ai: roomAiConfigs.map((cfg) => ({
             id: cfg.model,
-            label: cfg.modelName || 'Unknown AI',
+            // Fallback: try modelName, then short model ID (no provider prefix), then 'AI'
+            label: cfg.modelName
+                || cfg.model?.split('/').pop()
+                || 'AI',
             type: 'ai' as const,
         })),
         repos: projectRepos.map((r) => ({