diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index b4888dafe0..4c52e78205 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -123,7 +123,7 @@ class RustTimeline(
     )
 
     override val forwardPaginationStatus = MutableStateFlow(
-        Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode !is Timeline.Mode.FocusedOnEvent)
+        Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode is Timeline.Mode.FocusedOnEvent)
     )
 
     init {
@@ -221,7 +221,6 @@ class RustTimeline(
                         items = items,
                         hasMoreToLoadBackward = backwardPaginationStatus.hasMoreToLoad,
                         hasMoreToLoadForward = forwardPaginationStatus.hasMoreToLoad,
-                        timelineMode = mode,
                     )
                 }
                 .let { items ->
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
index 22b70b1d35..6d42af54b5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
@@ -18,9 +18,8 @@ class LoadingIndicatorsPostProcessor(private val systemClock: SystemClock) {
         items: List<MatrixTimelineItem>,
         hasMoreToLoadBackward: Boolean,
         hasMoreToLoadForward: Boolean,
-        timelineMode: Timeline.Mode,
     ): List<MatrixTimelineItem> {
-        val shouldAddForwardLoadingIndicator = timelineMode is Timeline.Mode.Live && hasMoreToLoadForward && items.isNotEmpty()
+        val shouldAddForwardLoadingIndicator = hasMoreToLoadForward && items.isNotEmpty()
         val currentTimestamp = systemClock.epochMillis()
         return buildList {
             if (hasMoreToLoadBackward) {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
index c92fb9776b..881d718392 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
@@ -24,7 +24,6 @@ class LoadingIndicatorsPostProcessorTest {
             items = listOf(messageEvent, messageEvent2),
             hasMoreToLoadBackward = true,
             hasMoreToLoadForward = false,
-            timelineMode = Timeline.Mode.Live,
         )
         assertThat(result).containsExactly(
             MatrixTimelineItem.Virtual(
@@ -47,7 +46,6 @@ class LoadingIndicatorsPostProcessorTest {
             items = listOf(messageEvent, messageEvent2),
             hasMoreToLoadBackward = false,
             hasMoreToLoadForward = true,
-            timelineMode = Timeline.Mode.Live,
         )
         assertThat(result).containsExactly(
             messageEvent,
@@ -70,7 +68,6 @@ class LoadingIndicatorsPostProcessorTest {
             items = listOf(messageEvent, messageEvent2),
             hasMoreToLoadBackward = true,
             hasMoreToLoadForward = true,
-            timelineMode = Timeline.Mode.Live,
         )
         assertThat(result).containsExactly(
             MatrixTimelineItem.Virtual(
@@ -100,7 +97,6 @@ class LoadingIndicatorsPostProcessorTest {
             items = listOf(),
             hasMoreToLoadBackward = true,
             hasMoreToLoadForward = true,
-            timelineMode = Timeline.Mode.Live,
         )
         assertThat(result).containsExactly(
             MatrixTimelineItem.Virtual(