diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
index 2103833704..c89c50ab9b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
@@ -24,23 +24,30 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import org.matrix.rustcomponents.sdk.RoomListService
 import org.matrix.rustcomponents.sdk.RoomListServiceState
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
 
 class RustSyncService(
     private val roomListService: RoomListService,
     sessionCoroutineScope: CoroutineScope
 ) : SyncService {
 
+    private val isSyncing = AtomicBoolean(false)
+
     override fun startSync() = runCatching {
-        if (!roomListService.isSyncing()) {
+        if (isSyncing.compareAndSet(false, true)) {
+            Timber.v("Start sync")
             roomListService.sync()
         }
     }
 
     override fun stopSync() = runCatching {
-        if (roomListService.isSyncing()) {
+        if (isSyncing.compareAndSet(true, false)) {
+            Timber.v("Stop sync")
             roomListService.stopSync()
         }
     }
@@ -49,6 +56,10 @@ class RustSyncService(
         roomListService
             .stateFlow()
             .map(RoomListServiceState::toSyncState)
+            .onEach { state ->
+                Timber.v("Sync state=$state")
+                isSyncing.set(state == SyncState.Syncing)
+            }
             .distinctUntilChanged()
-            .stateIn(sessionCoroutineScope, SharingStarted.WhileSubscribed(), SyncState.Idle)
+            .stateIn(sessionCoroutineScope, SharingStarted.Eagerly, SyncState.Idle)
 }