diff --git a/src/app/server/[ip]/page.tsx b/src/app/server/[ip]/page.tsx
index 75484bb..901e145 100644
--- a/src/app/server/[ip]/page.tsx
+++ b/src/app/server/[ip]/page.tsx
@@ -15,7 +15,6 @@ export default function Server() {
   const { ip } = useParams<{ ip: string }>();
   const searchParams = useSearchParams();
   const serverRef = useRef<WebSocket | null>(null);
-  const [server, setServer] = useState<undefined | ServerType>();
   const app = useApp();
   const { messages, addMessage } = useServerMessages();
 
@@ -26,7 +25,7 @@ export default function Server() {
       auth(
         ip,
         serverRef,
-        setServer,
+        app.setServer,
         (m) => addMessage(ip, m),
         () => {},
         msgs ? msgs[msgs.length - 1]?.id : undefined
@@ -37,21 +36,20 @@ export default function Server() {
   );
 
   useEffect(() => {
-    app.setServer(server);
     const channelId = searchParams.get("ch");
     if (channelId) {
       app.setCurrentChannel(
-        server?.channels.find((v) => v.id === channelId) ||
-          server?.channels[0] ||
+        app.server?.channels.find((v) => v.id === channelId) ||
+          app.server?.channels[0] ||
           null
       );
     } else {
-      app.setCurrentChannel(server?.channels[0] || null);
+      app.setCurrentChannel(app.server?.channels[0] || null);
     }
-  }, [server]);
+  }, [app.server]);
 
   return (
-    <AppLayout app={app} server={server}>
+    <AppLayout app={app}>
       <ChannelView
         app={app}
         messages={messages}
diff --git a/src/components/app/AppLayout.tsx b/src/components/app/AppLayout.tsx
index 19fb9b6..cac3790 100644
--- a/src/components/app/AppLayout.tsx
+++ b/src/components/app/AppLayout.tsx
@@ -18,13 +18,11 @@ export default function AppLayout({
   children,
   chatWith,
   onNewMessage,
-  server,
   app,
 }: {
   onNewMessage?: (msg: Message) => void;
   chatWith?: string;
   children?: React.ReactNode;
-  server?: Server;
   app: App;
 }) {
   const router = useRouter();
@@ -77,8 +75,8 @@ export default function AppLayout({
 
         <div className="flex-1 min-w-0 flex flex-col bg-sidebar">
           <div className="flex-1 min-h-0">
-            {server ? (
-              <SidebarChannels server={server} app={app} />
+            {app.server ? (
+              <SidebarChannels app={app} />
             ) : (
               <SidebarDMs app={app} />
             )}
diff --git a/src/components/app/SidebarChannels.tsx b/src/components/app/SidebarChannels.tsx
index 66219bb..187e3ca 100644
--- a/src/components/app/SidebarChannels.tsx
+++ b/src/components/app/SidebarChannels.tsx
@@ -36,21 +36,15 @@ export function ChannelItem({ channel, app }: { channel: Channel; app: App }) {
   );
 }
 
-export default function SidebarChannels({
-  server,
-  app,
-}: {
-  server: Server;
-  app: App;
-}) {
+export default function SidebarChannels({ app }: { app: App }) {
   return (
     <div className="w-full flex flex-col bg-sidebar">
       <div className="p-3 border-b flex items-center gap-2">
-        <h2>{server.name}</h2>
+        <h2>{app.server?.name}</h2>
       </div>
       <ScrollArea className="flex-1">
         <div className="p-2 flex flex-col gap-2">
-          {server.channels.map((channel: Channel) => (
+          {app.server?.channels.map((channel: Channel) => (
             <ChannelItem key={channel.id} channel={channel} app={app} />
           ))}
         </div>