diff --git a/src/qml/TimelineView.qml b/src/qml/TimelineView.qml
index e8c5abb39..90cebd505 100644
--- a/src/qml/TimelineView.qml
+++ b/src/qml/TimelineView.qml
@@ -79,6 +79,10 @@ QQC2.ScrollView {
 
         model: root.messageFilterModel
 
+        onCountChanged: if (root.roomChanging) {
+            root.positionViewAtBeginning();
+        }
+
         Timer {
             interval: 1000
             running: messageListView.atYBeginning