diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 675467d9a..51466fc75 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -221,7 +221,6 @@ Kirigami.ScrollablePage {
         visible: !invitation.visible
 
         readonly property int largestVisibleIndex: count > 0 ? indexAt(contentX + (width / 2), contentY + height - 1) : -1
-        readonly property bool noNeedMoreContent: !currentRoom || currentRoom.eventsHistoryJob || currentRoom.allHistoryLoaded
         readonly property bool isLoaded: page.width * page.height > 10
 
         spacing: Kirigami.Units.smallSpacing
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index 3bf970347..c5a37885c 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -380,7 +380,9 @@ bool MessageEventModel::canFetchMore(const QModelIndex &parent) const
 void MessageEventModel::fetchMore(const QModelIndex &parent)
 {
     Q_UNUSED(parent);
-    m_currentRoom->getPreviousContent(20);
+    if (m_currentRoom) {
+        m_currentRoom->getPreviousContent(20);
+    }
 }