diff --git a/linphone-app/ui/modules/Common/Form/ComboBox.qml b/linphone-app/ui/modules/Common/Form/ComboBox.qml
index 715e6d1ce..f83fd16ec 100644
--- a/linphone-app/ui/modules/Common/Form/ComboBox.qml
+++ b/linphone-app/ui/modules/Common/Form/ComboBox.qml
@@ -54,6 +54,7 @@ Controls.ComboBox {
 		width: comboBox.selectionWidth
 		clip: true
 		RowLayout {
+			id: contentLayout
 			anchors {
 				fill: parent
 				leftMargin: comboBox.haveMargin ? ComboBoxStyle.contentItem.leftMargin : 0
diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
index b570574c1..4dccf0f6f 100644
--- a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
+++ b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
@@ -21,6 +21,7 @@ Item{
 	property alias isFullscreen: camera.isFullscreen
 	property alias isCameraFromDevice: camera.isCameraFromDevice
 	property bool showCloseButton: true
+	property bool showActiveSpeaker: true
 	property color color : CameraViewStyle.outBackgroundColor
 	signal closeRequested()
 	
@@ -35,7 +36,7 @@ Item{
         spread: 0.9
         color: CameraViewStyle.border.color
         cornerRadius: backgroundArea.radius + glowRadius
-        visible: mainItem.currentDevice && mainItem.currentDevice.isSpeaking
+        visible: mainItem.showActiveSpeaker && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
     }
 	Rectangle {
         id: backgroundArea
diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
index 49a2f7e6d..2f14f40cf 100644
--- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
@@ -42,7 +42,7 @@ Notification {
 				property var sipObserver: SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress)		
 				showAuxData: !chatRoomModel.isOneToOne
 				entry: ({
-								sipAddress: sipObserver.peerAddress,
+								sipAddress: sipObserver ? sipObserver.peerAddress : '',
 								contactModel: sipObserver.contact,
 								isOneToOne: chatRoomModel.isOneToOne,
 								haveEncryption: chatRoomModel.haveEncryption,
diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
index 2be1ad53b..f4dd449ef 100644
--- a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
+++ b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
@@ -46,6 +46,7 @@ Item {
 		anchors.rightMargin: isRightReducedLayout ? 10 : 140
 		isPaused: (callModel && callModel.pausedByUser) || (currentDevice && currentDevice.isPaused) //callModel.pausedByUser
 		showCloseButton: false
+		showActiveSpeaker: false	// This is an active speaker. We don't need to show the indicator.
 		color: 'black'
 	}
 	ScrollableListView{
diff --git a/linphone-app/ui/views/App/Main/MainWindow.js b/linphone-app/ui/views/App/Main/MainWindow.js
index 7477785bb..7dc7942f9 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.js
+++ b/linphone-app/ui/views/App/Main/MainWindow.js
@@ -116,7 +116,7 @@ function updateSelectedEntry (view, props) {
   } else if (view === 'Contacts') {
     item.contactsEntry.select()
   } else if (view === 'Conferences') {
-    item.contactsEntry.select()
+    item.conferencesEntry.select()
   }
 }
 
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index a99225275..841cd24f8 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -72,6 +72,8 @@ ApplicationWindow {
 		sourceComponent: ColumnLayout {
 			// Workaround to get these properties in `MainWindow.js`.
 			readonly property alias contactsEntry: contactsEntry
+			readonly property alias conferencesEntry: conferencesEntry
+			
 			readonly property alias contentLoader: contentLoader
 			//readonly property alias conferencesEntry: conferencesEntry
 			readonly property alias menu: menu