diff --git a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
index 852b54fdcc..884403635b 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
@@ -44,7 +44,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
         object Progress : State()
     }
 
-    private val dimensionConverter = DimensionConverter(context.resources)
     private val views: ViewRemoveJitsiWidgetBinding
     private var state: State = State.Unmount
     var onCompleteSliding: (() -> Unit)? = null
@@ -89,7 +88,10 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 
     fun render(roomDetailViewState: RoomDetailViewState) {
         val summary = roomDetailViewState.asyncRoomSummary()
-        val newState = if (summary?.membership != Membership.JOIN || !roomDetailViewState.isAllowedToManageWidgets || roomDetailViewState.jitsiState.widgetId == null) {
+        val newState = if (summary?.membership != Membership.JOIN ||
+                roomDetailViewState.isWebRTCCallOptionAvailable() ||
+                !roomDetailViewState.isAllowedToManageWidgets ||
+                roomDetailViewState.jitsiState.widgetId == null) {
             State.Unmount
         } else if (roomDetailViewState.jitsiState.deleteWidgetInProgress) {
             State.Progress
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index a3c6fb7c05..0c41f7e316 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -745,7 +745,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             R.id.voice_call       -> state.isWebRTCCallOptionAvailable()
             R.id.video_call       -> state.isWebRTCCallOptionAvailable() || state.jitsiState.confId == null || state.jitsiState.hasJoined
             // Show Join conference button only if there is an active conf id not joined. Otherwise fallback to default video disabled. ^
-            R.id.join_conference  -> state.jitsiState.confId != null && !state.jitsiState.hasJoined
+            R.id.join_conference  -> !state.isWebRTCCallOptionAvailable() && state.jitsiState.confId != null && !state.jitsiState.hasJoined
             R.id.search           -> true
             R.id.dev_tools        -> vectorPreferences.developerMode()
             else                  -> false