diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
index 9f13c7bd4..5c819c169 100644
--- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
+++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
@@ -6,6 +6,7 @@ import UtilsCpp 1.0
 
 import App.Styles 1.0
 
+import 'qrc:/ui/scripts/Utils/utils.js' as Utils
 // =============================================================================
 
 Avatar {
@@ -23,9 +24,7 @@ Avatar {
 										  : null
 	property var _username: conferenceInfoModel
 							? conferenceInfoModel.subject
-							: call && call.conferenceModel
-							  ? call.conferenceModel.subject
-							  : _sipAddressObserver
+							: _sipAddressObserver
 								? UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress)
 								: ''
 	property bool isPaused: (call && (call.status === CallModel.CallStatusPaused)) || (participantDeviceModel && participantDeviceModel.isPaused) || false
diff --git a/linphone-app/ui/views/App/Calls/IncallGrid.qml b/linphone-app/ui/views/App/Calls/IncallGrid.qml
index 44b89592e..97b777f5a 100644
--- a/linphone-app/ui/views/App/Calls/IncallGrid.qml
+++ b/linphone-app/ui/views/App/Calls/IncallGrid.qml
@@ -56,9 +56,10 @@ Mosaic {
 				id: cameraView
 				anchors.fill: parent
 				
+				callModel: index >= 0 ? participantDevices.callModel : null	// do this before to prioritize changing call on remove
 				deactivateCamera: index <0 || !grid.cameraEnabled || grid.callModel.pausedByUser
 				currentDevice: gridModel.participantDevices.getAt(index)
-				callModel: participantDevices.callModel
+				
 				isCameraFromDevice: true
 				isPaused: avatarCell.currentDevice && avatarCell.currentDevice.isPaused
 				showCloseButton: false
diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
index f6ea94c65..1ba2085fd 100644
--- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml
+++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
@@ -144,6 +144,10 @@ Rectangle {
 					width : cameraWidth
 					callModel:  mainItem.callModel
 					conferenceInfoModel: mainItem.conferenceInfoModel
+											? mainItem.conferenceInfoModel
+											: mainItem.callModel
+												? mainItem.callModel.conferenceModel
+												: null
 					deactivateCamera: !mainItem.previewLoaderEnabled || mainItem.isEnding
 					
 					/*