diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 5e4efcea4..bd9fc505c 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -407,12 +407,6 @@ Kirigami.ScrollablePage {
         }
 
         Component.onCompleted: {
-            if (currentRoom) {
-                if (currentRoom.timelineSize < 20) {
-                    currentRoom.getPreviousContent(50);
-                }
-            }
-
             positionViewAtBeginning();
         }
 
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index 5e9726fe1..c8b707b95 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -88,7 +88,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
     if (room) {
         m_lastReadEventIndex = QPersistentModelIndex(QModelIndex());
         room->setDisplayed();
-        if (m_currentRoom->timelineSize() < 10) {
+        if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) {
             room->getPreviousContent(50);
         }
         lastReadEventId = room->readMarkerEventId();