diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index bee3ea5cc6a7479ef723ad0860cc50c727e74ab3..28599ecb6db21662136b6791df45d26ed6715685 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -46,7 +46,7 @@ Item {
 
     function stopBooth(){
         if (!AccountAdapter.hasVideoCall()) {
-        VideoDevices.stopDevice(preview.deviceId)
+            VideoDevices.stopDevice(preview.deviceId)
         }
         isPreviewing = false
     }
diff --git a/src/mainview/components/OngoingCallPage.qml b/src/mainview/components/OngoingCallPage.qml
index 1c9f9547f921bc3fe7a29996191cf47e431f8a25..b0c6d8b8fe7aaf7631a62948799dcfad7b8e955d 100644
--- a/src/mainview/components/OngoingCallPage.qml
+++ b/src/mainview/components/OngoingCallPage.qml
@@ -33,7 +33,7 @@ Rectangle {
     id: root
 
     property var accountPeerPair: ["", ""]
-    property variant clickPos: "1,1"
+    property string clickPos: "1,1"
     property int previewMargin: 15
     property int previewMarginYTop: previewMargin + 42
     property int previewMarginYBottom: previewMargin + 84
@@ -44,14 +44,6 @@ Rectangle {
     property var linkedWebview: null
     property string callPreviewId: ""
 
-    onCallPreviewIdChanged: {
-        testLog("\n\n CHANGING CALLPREVIEWID" + root.callPreviewId + " " + previewRenderer.rendererId + " \n\n")
-    }
-
-    function testLog(txt) {
-        console.log(this, txt)
-    }
-
     color: "black"
 
     onAccountPeerPairChanged: {
@@ -194,7 +186,7 @@ Rectangle {
                     rendererId: root.callPreviewId
 
                     onVisibleChanged: {
-                        if (!visible) {
+                        if (!visible && !AccountAdapter.hasVideoCall()) {
                             VideoDevices.stopDevice(rendererId, true)
                         }
                     }
@@ -291,8 +283,8 @@ Rectangle {
 
                         function onUpdateOverlay(isPaused, isAudioOnly, isAudioMuted, isVideoMuted,
                                                  isSIP, isConferenceCall, isGrid, previewId) {
-                            if (previewId != "") {
-                                if (root.callPreviewId != previewId)
+                            if (previewId !== "") {
+                                if (root.callPreviewId !== previewId)
                                     VideoDevices.stopDevice(root.callPreviewId, true)
                                 VideoDevices.startDevice(previewId)
                             } else {