diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index 8b941bbb5..1d786487b 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -211,7 +211,9 @@ class ChatViewModel(
         channels.forEach { channel ->
             if (!state.getJoinedChannelsValue().contains(channel)) {
                 joinChannel(channel)
+                return@forEach
             }
+            switchToChannel(channel)
         }
         
         val selectedPeer = state.getSelectedPrivateChatPeerValue()