diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
index eabab5850e..c343fc2da0 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
@@ -29,7 +29,13 @@ class MatrixRoom(
     }
 
     fun timeline(): MatrixTimeline {
-        return MatrixTimeline(this, room, coroutineScope, coroutineDispatchers)
+        return MatrixTimeline(
+            matrixRoom = this,
+            room = room,
+            slidingSyncRoom = slidingSyncRoom,
+            coroutineScope = coroutineScope,
+            coroutineDispatchers = coroutineDispatchers
+        )
     }
 
     val roomId = RoomId(room.id())
diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
index 641d281385..f4a5e27c8d 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
@@ -16,6 +16,7 @@ import java.util.*
 class MatrixTimeline(
     private val matrixRoom: MatrixRoom,
     private val room: Room,
+    private val slidingSyncRoom: SlidingSyncRoom,
     private val coroutineScope: CoroutineScope,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) : TimelineListener {
@@ -105,7 +106,7 @@ class MatrixTimeline(
         }
 
     fun addListener(timelineListener: TimelineListener) {
-        room.addTimelineListener(timelineListener)
+        slidingSyncRoom.addTimelineListener(timelineListener)
     }
 
     fun initialize() {
@@ -113,7 +114,7 @@ class MatrixTimeline(
     }
 
     fun dispose() {
-        room.removeTimeline()
+        slidingSyncRoom.removeTimeline()
     }
 
     /**