diff --git a/Linphone/view/Control/Display/Chat/ChatListView.qml b/Linphone/view/Control/Display/Chat/ChatListView.qml
index fce6fdb3..9e283f86 100644
--- a/Linphone/view/Control/Display/Chat/ChatListView.qml
+++ b/Linphone/view/Control/Display/Chat/ChatListView.qml
@@ -48,6 +48,14 @@ ListView {
         }
         onModelReset: {
             loading = false
+            if (mainItem.chatToSelectLater) {
+                selectChat(mainItem.chatToSelectLater)
+                mainItem.chatToSelectLater = null
+            }
+            else if (mainItem.chatToSelect) {
+                selectChat(mainItem.chatToSelect)
+                mainItem.chatToSelect = null
+            }
         }
         onRowsRemoved: {
             var index = mainItem.currentIndex