diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 1b4b6152e3..5199a2b492 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -3014,7 +3014,11 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun setInitialForceScrollEnabled(enabled: Boolean, stickToBottom: Boolean = false) {
-        val shouldStickToBottom = stickToBottom || (!enabled && !views.timelineRecyclerView.canScrollVertically(1))
+        val shouldStickToBottom = stickToBottom ||
+                (!enabled &&
+                        !views.timelineRecyclerView.canScrollVertically(1) &&
+                        !timelineViewModel.timeline.hasMoreToLoad(Timeline.Direction.FORWARDS)
+                )
         scrollOnNewMessageCallback.initialForceScroll = enabled
         if (shouldStickToBottom) {
             layoutManager.disablePreferredAnchorPlacement()