diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index b9d005f70..72ac64ab6 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -861,7 +861,7 @@ internal fun CallActivity.navigateToOutgoingCall() {
     findNavController(R.id.nav_host_fragment).navigate(
         R.id.action_global_outgoingCallFragment,
         null,
-        popupTo(R.id.outgoingCallFragment, true)
+        popupTo(R.id.singleCallFragment, true)
     )
 }
 
@@ -871,7 +871,7 @@ internal fun CallActivity.navigateToIncomingCall(earlyMediaVideoEnabled: Boolean
     findNavController(R.id.nav_host_fragment).navigate(
         R.id.action_global_incomingCallFragment,
         args,
-        popupTo(R.id.incomingCallFragment, true)
+        popupTo(R.id.singleCallFragment, true)
     )
 }
 
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
index b53be2c7f..30d92702f 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
@@ -418,7 +418,7 @@ class ControlsViewModel : ViewModel() {
     }
 
     private fun updateVideoEnabled() {
-        val currentCall = coreContext.core.currentCall
+        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
         val enabled = currentCall?.currentParams?.isVideoEnabled ?: false
         // Prevent speaker to turn on each time a participant joins a video conference
         val isConference = currentCall?.conference != null