diff --git a/src/app/chat/page.tsx b/src/app/chat/page.tsx
index ae4aba9..2c3d7fe 100644
--- a/src/app/chat/page.tsx
+++ b/src/app/chat/page.tsx
@@ -397,7 +397,7 @@ export default function Home() {
 
   return (
     <ChatLayout 
-      title={`#${channel}`}
+      title={channel ? `#${channel}` : `Waiting for channel selection...`}
       subtitle={error}
       props={{
         channels,