diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx
index e52e4cab..d091f1b3 100644
--- a/src/controllers/modals/components/CreateInvite.tsx
+++ b/src/controllers/modals/components/CreateInvite.tsx
@@ -85,4 +85,5 @@ export default function CreateInvite({
             ]}
         />
     );
-}
\ No newline at end of file
+}
+
diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx
index 4d575f9e..bc2d96b7 100644
--- a/src/pages/channels/Channel.tsx
+++ b/src/pages/channels/Channel.tsx
@@ -98,10 +98,9 @@ export const Channel = observer(
     ({ id, server_id }: { id: string; server_id: string }) => {
         const client = useClient();
         const state = useApplicationState();
-
-        if (!client.channels.exists(id)) {
-            if (server_id && !client.channels.exists(id)) {
-                const server = client.servers.get(server_id);
+        if (!client.channels.get(id)) {      
+            if (server_id) {
+                  const server = client.servers.get(server_id);
                 if (server && server.channel_ids.length > 0) {
                     let target_id = server.channel_ids[0];
                     const last_id = state.layout.getLastOpened(server_id);