diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml
index 17b27d1c4..d5b74aed6 100644
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -228,7 +228,7 @@ Kirigami.ScrollablePage {
         }
 
         onAtYEndChanged: if (atYEnd && hasScrolledUpBefore) {
-            if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden)) {
+            if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) && messageListView.count > 0) {
                 currentRoom.markAllMessagesAsRead();
             }
             hasScrolledUpBefore = false;