diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
index 4d79abdabb..d90f352cfa 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
@@ -65,6 +65,14 @@ class InternalRoomMemberModerationStateProvider : PreviewParameterProvider<Inter
                 selectedUser = anAlice(),
                 banUserAsyncAction = AsyncAction.Loading,
             ),
+            aRoomMembersModerationState(
+                selectedUser = anAlice(),
+                unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
+            ),
+            aRoomMembersModerationState(
+                selectedUser = anAlice(),
+                unbanUserAsyncAction = AsyncAction.Loading,
+            ),
         )
 }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
index 0148b45aa8..0af29e75b2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
@@ -55,6 +55,7 @@ import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -138,13 +139,16 @@ class JoinedRustRoom(
 
     override val liveTimeline = liveInnerTimeline.map(mode = Timeline.Mode.Live)
 
-    override val syncUpdateFlow = liveTimeline.onSyncedEventReceived
-        .map { systemClock.epochMillis() }
-        .stateIn(
-            scope = roomCoroutineScope,
-            started = WhileSubscribed(),
-            initialValue = systemClock.epochMillis(),
-        )
+    override val syncUpdateFlow = flow {
+        var counter = 0L
+        liveTimeline.onSyncedEventReceived.collect {
+            emit(++counter)
+        }
+    }.stateIn(
+        scope = roomCoroutineScope,
+        started = WhileSubscribed(),
+        initialValue = 0L,
+    )
 
     init {
         subscribeToRoomMembersChange()
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
index 12a25c3169..c522016ee1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
@@ -33,22 +33,22 @@ internal class MatrixTimelineDiffProcessor(
             Timber.v("Update timeline items from postDiffs (with ${diffs.size} items) on ${Thread.currentThread()}")
             val result = processDiffs(diffs)
             timelineItems.emit(result.items())
-            if (result.hasNewEventsFromSync()) {
+            if (result.hasNewEventsFromSync) {
                 syncedEventReceivedFlow.emit(Unit)
             }
-            if (result.hasMembershipChangeEventFromSync()) {
+            if (result.hasMembershipChangeEventFromSync) {
                 membershipChangeEventReceivedFlow.emit(Unit)
             }
         }
     }
 
     private suspend fun processDiffs(diffs: List<TimelineDiff>): DiffingResult {
-        val mutableTimelineItems = if (timelineItems.replayCache.isNotEmpty()) {
-            timelineItems.first().toMutableList()
+        val timelineItems = if (timelineItems.replayCache.isNotEmpty()) {
+            timelineItems.first()
         } else {
-            mutableListOf()
+            emptyList()
         }
-        val result = DiffingResult(items = mutableTimelineItems)
+        val result = DiffingResult(timelineItems)
         diffs.forEach { diff ->
             result.applyDiff(diff)
         }
@@ -107,14 +107,14 @@ internal class MatrixTimelineDiffProcessor(
     }
 }
 
-private class DiffingResult(
-    private val items: MutableList<MatrixTimelineItem>,
-    private var hasNewEventsFromSync: Boolean = false,
-    private var hasMembershipChangeEventFromSync: Boolean = false,
-) {
+private class DiffingResult(initialItems: List<MatrixTimelineItem>) {
+    private val items = initialItems.toMutableList()
+    var hasNewEventsFromSync: Boolean = false
+        private set
+    var hasMembershipChangeEventFromSync: Boolean = false
+        private set
+
     fun items(): List<MatrixTimelineItem> = items
-    fun hasNewEventsFromSync(): Boolean = hasNewEventsFromSync
-    fun hasMembershipChangeEventFromSync(): Boolean = hasMembershipChangeEventFromSync
 
     fun add(item: MatrixTimelineItem) {
         processItem(item)