diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
index 5bf55105cc..c8cb4eef1c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
@@ -31,7 +31,7 @@ class MatrixTimelineItemMapper(
     private val eventTimelineItemMapper: EventTimelineItemMapper = EventTimelineItemMapper(),
 ) {
     fun map(timelineItem: TimelineItem): MatrixTimelineItem = timelineItem.use {
-        val uniqueId = timelineItem.uniqueId().toString()
+        val uniqueId = timelineItem.uniqueId()
         val asEvent = it.asEvent()
         if (asEvent != null) {
             val eventTimelineItem = eventTimelineItemMapper.map(asEvent)
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 fb051e7a35..fee898988e 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
@@ -174,23 +174,25 @@ class RustTimeline(
 
     // Use NonCancellable to avoid breaking the timeline when the coroutine is cancelled.
     override suspend fun paginate(direction: Timeline.PaginationDirection): Result<Boolean> = withContext(NonCancellable) {
-        initLatch.await()
-        runCatching {
-            if (!canPaginate(direction)) throw TimelineException.CannotPaginate
-            updatePaginationStatus(direction) { it.copy(isPaginating = true) }
-            when (direction) {
-                Timeline.PaginationDirection.BACKWARDS -> inner.paginateBackwards(PAGINATION_SIZE.toUShort())
-                Timeline.PaginationDirection.FORWARDS -> inner.focusedPaginateForwards(PAGINATION_SIZE.toUShort())
-            }
-        }.onFailure { error ->
-            updatePaginationStatus(direction) { it.copy(isPaginating = false) }
-            if (error is TimelineException.CannotPaginate) {
-                Timber.d("Can't paginate $direction on room ${matrixRoom.roomId} with paginationStatus: ${backPaginationStatus.value}")
-            } else {
-                Timber.e(error, "Error paginating $direction on room ${matrixRoom.roomId}")
+        withContext(dispatcher) {
+            initLatch.await()
+            runCatching {
+                if (!canPaginate(direction)) throw TimelineException.CannotPaginate
+                updatePaginationStatus(direction) { it.copy(isPaginating = true) }
+                when (direction) {
+                    Timeline.PaginationDirection.BACKWARDS -> inner.paginateBackwards(PAGINATION_SIZE.toUShort())
+                    Timeline.PaginationDirection.FORWARDS -> inner.focusedPaginateForwards(PAGINATION_SIZE.toUShort())
+                }
+            }.onFailure { error ->
+                updatePaginationStatus(direction) { it.copy(isPaginating = false) }
+                if (error is TimelineException.CannotPaginate) {
+                    Timber.d("Can't paginate $direction on room ${matrixRoom.roomId} with paginationStatus: ${backPaginationStatus.value}")
+                } else {
+                    Timber.e(error, "Error paginating $direction on room ${matrixRoom.roomId}")
+                }
+            }.onSuccess { hasReachedEnd ->
+                updatePaginationStatus(direction) { it.copy(isPaginating = false, hasMoreToLoad = !hasReachedEnd) }
             }
-        }.onSuccess { hasReachedEnd ->
-            updatePaginationStatus(direction) { it.copy(isPaginating = false, hasMoreToLoad = !hasReachedEnd) }
         }
     }
 
@@ -214,18 +216,20 @@ class RustTimeline(
         backPaginationStatus.map { it.hasMoreToLoad }.distinctUntilChanged(),
         forwardPaginationStatus.map { it.hasMoreToLoad }.distinctUntilChanged(),
     ) { timelineItems, hasMoreToLoadBackward, hasMoreToLoadForward ->
-        timelineItems
-            .let { items -> encryptedHistoryPostProcessor.process(items) }
-            .let { items ->
-                roomBeginningPostProcessor.process(
-                    items = items,
-                    isDm = matrixRoom.isDm,
-                    hasMoreToLoadBackwards = hasMoreToLoadBackward
-                )
-            }
-            .let { items -> loadingIndicatorsPostProcessor.process(items, hasMoreToLoadBackward, hasMoreToLoadForward) }
-            // Keep lastForwardIndicatorsPostProcessor last
-            .let { items -> lastForwardIndicatorsPostProcessor.process(items) }
+        withContext(dispatcher) {
+            timelineItems
+                .let { items -> encryptedHistoryPostProcessor.process(items) }
+                .let { items ->
+                    roomBeginningPostProcessor.process(
+                        items = items,
+                        isDm = matrixRoom.isDm,
+                        hasMoreToLoadBackwards = hasMoreToLoadBackward
+                    )
+                }
+                .let { items -> loadingIndicatorsPostProcessor.process(items, hasMoreToLoadBackward, hasMoreToLoadForward) }
+                // Keep lastForwardIndicatorsPostProcessor last
+                .let { items -> lastForwardIndicatorsPostProcessor.process(items) }
+        }
     }
 
     override fun close() {