diff --git a/linphone-app/ui/modules/Linphone/Calls/Calls.qml b/linphone-app/ui/modules/Linphone/Calls/Calls.qml
index c99e02614..4ce7f47f5 100644
--- a/linphone-app/ui/modules/Linphone/Calls/Calls.qml
+++ b/linphone-app/ui/modules/Linphone/Calls/Calls.qml
@@ -36,7 +36,7 @@ ListView {
 		if(lastCall && lastCall.status === CallModel.CallStatusConnected)
 			Logic.setIndexWithCall(lastCall)
 		else{
-			for(var i = 0 ; i < model.length() ; ++i){
+			for(var i = 0 ; i < model.rowCount() ; ++i){
 				var call = model.data(model.index(i, 0))
 				if( call && call.status === CallModel.CallStatusConnected){
 					Logic.updateSelectedCall(call, i)
diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js
index 66e6dc51a..aa78bbabf 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.js
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.js
@@ -59,8 +59,8 @@ function openConferenceManager (params, exitHandler) {
 
 function openWaitingRoom(model){
 	calls.refreshCall()
-	if(window.conferenceInfoModel)
-		window.conferenceInfoModel = null;
+	if(window.conferenceInfoModel && middlePane.sourceComponent == waitingRoom)
+		middlePane.item.reset()
 	window.conferenceInfoModel = model
 }
 
diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
index 1626fcb40..6148a6624 100644
--- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml
+++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
@@ -26,6 +26,10 @@ Rectangle {
 	
 	signal cancel()
 	
+	function reset(){
+		close()
+		open()
+	}
 	function close(){
 		mainItem.previewLoaderEnabled = false// Need it to close camera.
 	}
@@ -35,7 +39,6 @@ Rectangle {
 	
 	//onCallModelChanged: callModel ? contentsStack.replace(callingComponent) : contentsStack.replace(cameraComponent)
 	//onCallModelChanged: contentsStack.flipped = !!callModel
-	
 	Component.onDestruction: {mainItem.previewLoaderEnabled = false;_sipAddressObserver=null}// Need to set it to null because of not calling destructor if not.
 	
 	Connections{