From 697d0a4e2fceb3a32ef3eb0ccdc1ba792b29dbd0 Mon Sep 17 00:00:00 2001
From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Wed, 13 May 2026 09:24:15 +0530
Subject: [PATCH] prevent call join if call not supported and started by other
 party

---
 src/app/features/call/CallView.tsx        | 8 ++++----
 src/app/features/room-nav/RoomNavItem.tsx | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/features/call/CallView.tsx b/src/app/features/call/CallView.tsx
index 053775e40..817aaf17f 100644
--- a/src/app/features/call/CallView.tsx
+++ b/src/app/features/call/CallView.tsx
@@ -18,7 +18,7 @@ import { useLivekitSupport } from '../../hooks/useLivekitSupport';
 function LivekitServerMissingMessage() {
   return (
     <Text style={{ margin: 'auto', color: color.Critical.Main }} size="L400" align="Center">
-      Your homeserver does not support calling. But you can still join call started by others.
+      Your homeserver does not support calling.
     </Text>
   );
 }
@@ -30,12 +30,12 @@ function JoinMessage({
   hasParticipant?: boolean;
   livekitSupported?: boolean;
 }) {
-  if (hasParticipant) return null;
-
   if (livekitSupported === false) {
     return <LivekitServerMissingMessage />;
   }
 
+  if (hasParticipant) return null;
+
   return (
     <Text style={{ margin: 'auto' }} size="L400" align="Center">
       Voice chat’s empty — Be the first to hop in!
@@ -80,7 +80,7 @@ function CallPrescreen() {
   const callEmbed = useCallEmbed();
   const inOtherCall = callEmbed && callEmbed.roomId !== room.roomId;
 
-  const canJoin = hasPermission && (livekitSupported || hasParticipant);
+  const canJoin = hasPermission && livekitSupported;
 
   return (
     <Scroll variant="Surface" hideTrack>
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index fb8794862..593f152f0 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -298,8 +298,8 @@ export function RoomNavItem({
       mx.getSafeUserId()
     );
 
-    // Do not join if missing permissions or no livekit support and call is not started by others
-    if (!hasCallPermission || (!livekitSupport(autoDiscoveryInfo) && callMembers.length === 0)) {
+    // Do not join if missing permissions or no livekit support
+    if (!hasCallPermission || !livekitSupport(autoDiscoveryInfo)) {
       return;
     }