diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt
index 745612df9..43eee9d1e 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt
@@ -55,7 +55,7 @@ class ControlsFadingViewModel : ViewModel() {
         ) {
             if (state == Call.State.StreamsRunning || state == Call.State.Updating || state == Call.State.UpdatedByRemote) {
                 val isVideoCall = coreContext.isVideoCallOrConferenceActive()
-                Log.i("[Controls Fading] Call is in state $state, video is enabled? $videoEnabled")
+                Log.i("[Controls Fading] Call is in state $state, video is ${if (isVideoCall) "enabled" else "disabled"}")
                 if (isVideoCall) {
                     videoEnabled.value = true
                     startTimer()
diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
index 389e8a97f..bf77b7617 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
@@ -188,7 +188,7 @@ class ControlsViewModel : ViewModel() {
         override fun onAudioDevicesListUpdated(core: Core) {
             if (core.callsNb == 0) return
             updateAudioRoutesState()
-            routeAudioToBluetoothIfAvailable(core.currentCall ?: core.calls[0])
+            coreContext.routeAudioToBluetoothIfAvailable(core.currentCall ?: core.calls[0])
         }
     }
 
@@ -443,18 +443,6 @@ class ControlsViewModel : ViewModel() {
         isBluetoothHeadsetSelected.value = audioDevice?.type == AudioDevice.Type.Bluetooth
     }
 
-    private fun routeAudioToBluetoothIfAvailable(call: Call) {
-        for (audioDevice in coreContext.core.audioDevices) {
-            if (audioDevice.type == AudioDevice.Type.Bluetooth &&
-                audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
-                Log.i("[Call] Found bluetooth audio device [${audioDevice.deviceName}], routing audio to it")
-                call.outputAudioDevice = audioDevice
-                return
-            }
-        }
-        Log.w("[Call] Didn't find any bluetooth audio device, keeping current audio route")
-    }
-
     private fun updateVideoAvailable() {
         val core = coreContext.core
         val currentCall = core.currentCall
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 0b37475ef..1bf0a2ff7 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -549,6 +549,18 @@ class CoreContext(val context: Context, coreConfig: Config) {
         }
     }
 
+    fun routeAudioToBluetoothIfAvailable(call: Call) {
+        for (audioDevice in core.audioDevices) {
+            if (audioDevice.type == AudioDevice.Type.Bluetooth &&
+                audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
+                Log.i("[Context] Found bluetooth audio device [${audioDevice.deviceName}], routing audio to it")
+                call.outputAudioDevice = audioDevice
+                return
+            }
+        }
+        Log.w("[Context] Didn't find any bluetooth audio device, keeping default audio route")
+    }
+
     /* Start call related activities */
 
     private fun onIncomingReceived() {
@@ -589,16 +601,4 @@ class CoreContext(val context: Context, coreConfig: Config) {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
         context.startActivity(intent)
     }
-
-    private fun routeAudioToBluetoothIfAvailable(call: Call) {
-        for (audioDevice in core.audioDevices) {
-            if (audioDevice.type == AudioDevice.Type.Bluetooth &&
-                    audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
-                Log.i("[Context] Found bluetooth audio device [${audioDevice.deviceName}], routing audio to it")
-                call.outputAudioDevice = audioDevice
-                return
-            }
-        }
-        Log.w("[Context] Didn't find any bluetooth audio device, keeping default audio route")
-    }
 }