diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
index ed6f3fae26..24610a64c9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
@@ -28,10 +28,10 @@ class RoomMembershipObserver {
         val change: MembershipChange,
     )
 
-    private val _updates = MutableSharedFlow<RoomMembershipUpdate>(replay = 1)
+    private val _updates = MutableSharedFlow<RoomMembershipUpdate>(extraBufferCapacity = 10)
     val updates = _updates.asSharedFlow()
 
-    fun notifyUserLeftRoom(roomId: RoomId) {
-        _updates.tryEmit(RoomMembershipUpdate(roomId, false, MembershipChange.LEFT))
+    suspend fun notifyUserLeftRoom(roomId: RoomId) {
+        _updates.emit(RoomMembershipUpdate(roomId, false, MembershipChange.LEFT))
     }
 }