diff --git a/src/components/common/ServerHeader.tsx b/src/components/common/ServerHeader.tsx
index 6fdf7387..1364780a 100644
--- a/src/components/common/ServerHeader.tsx
+++ b/src/components/common/ServerHeader.tsx
@@ -5,8 +5,6 @@ import { ServerPermission } from "revolt.js/dist/api/permissions";
 import { Server } from "revolt.js/dist/maps/Servers";
 import styled from "styled-components";
 
-import { Text } from "preact-i18n";
-
 import Header from "../ui/Header";
 import IconButton from "../ui/IconButton";
 
diff --git a/src/components/navigation/left/ServerSidebar.tsx b/src/components/navigation/left/ServerSidebar.tsx
index 61fca6b3..ad4b1d28 100644
--- a/src/components/navigation/left/ServerSidebar.tsx
+++ b/src/components/navigation/left/ServerSidebar.tsx
@@ -62,7 +62,11 @@ const ServerSidebar = observer((props: Props) => {
     if (!server) return <Redirect to="/" />;
 
     const channel = channel_id ? client.channels.get(channel_id) : undefined;
+
+    // The user selected no channel, let's see if there's a channel available
+    if (!channel && server.channel_ids.length > 0) return <Redirect to={`/server/${server_id}/channel/${server.channel_ids[0]}`} />;
     if (channel_id && !channel) return <Redirect to={`/server/${server_id}`} />;
+
     if (channel) useUnreads({ ...props, channel });
 
     useEffect(() => {