diff --git a/src/app/commoncomponents/LocalVideo.qml b/src/app/commoncomponents/LocalVideo.qml
index caca6c08..5bb34305 100644
--- a/src/app/commoncomponents/LocalVideo.qml
+++ b/src/app/commoncomponents/LocalVideo.qml
@@ -37,7 +37,8 @@ VideoView {
     }
 
     onVisibleChanged: {
-        const id = visible ? VideoDevices.getDefaultDevice() : ""
+        rendererId = rendererId ? rendererId : VideoDevices.getDefaultDevice()
+        const id = visible ? rendererId : ""
         startWithId(id)
     }
 }
diff --git a/src/app/mainview/components/OngoingCallPage.qml b/src/app/mainview/components/OngoingCallPage.qml
index affad4e6..d57a5d98 100644
--- a/src/app/mainview/components/OngoingCallPage.qml
+++ b/src/app/mainview/components/OngoingCallPage.qml
@@ -199,14 +199,6 @@ Rectangle {
                 visible: false
                 rendererId: ""
 
-                Connections {
-                    target: AvAdapter
-
-                    function onCurrentRenderingDeviceIdChanged() {
-                        previewRenderer.rendererId = AvAdapter.currentRenderingDeviceId
-                    }
-                }
-
                 height: width * invAspectRatio
                 width: Math.max(callPageMainRect.width / 5, JamiTheme.minimumPreviewWidth)
                 x: callPageMainRect.width - previewRenderer.width - previewMargin
@@ -312,6 +304,7 @@ Rectangle {
                                              isGrid)
                         callOverlay.isVideoMuted = !AvAdapter.isCapturing()
                         callOverlay.sharingActive = AvAdapter.isSharing()
+                        previewRenderer.rendererId = previewId
                         previewRenderer.visible = (AvAdapter.isSharing() || AvAdapter.isCapturing()) && participantsLayer.count == 0
                     }