diff --git a/shared/js/tree/Server.ts b/shared/js/tree/Server.ts
index 93bc62c4..4154e891 100644
--- a/shared/js/tree/Server.ts
+++ b/shared/js/tree/Server.ts
@@ -192,7 +192,7 @@ export class ServerEntry extends ChannelTreeEntry<ServerEvents> {
                 icon_class: "client-channel_switch",
                 name: tr("Join server text channel"),
                 callback: () => {
-                    this.channelTree.client.getChannelConversations().setSelectedConversation(0);
+                    this.channelTree.client.getChannelConversations().setSelectedConversation(this.channelTree.client.getChannelConversations().findOrCreateConversation(0));
                     this.channelTree.client.side_bar.showChannelConversations();
                 },
                 visible: !settings.static_global(Settings.KEY_SWITCH_INSTANT_CHAT)