diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
index 83891fe4d0..ced45ca192 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
@@ -35,7 +35,6 @@ import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
 import io.element.android.services.appnavstate.api.AppNavigationState
 import io.element.android.services.appnavstate.api.AppNavigationStateService
-import io.element.android.services.appnavstate.api.NavigationState
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import io.element.android.services.appnavstate.test.aNavigationState
 import io.element.android.tests.testutils.lambda.any
@@ -44,7 +43,6 @@ import io.element.android.tests.testutils.lambda.value
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
@@ -92,26 +90,25 @@ class DefaultNotificationDrawerManagerTest {
     @Test
     fun `react to applicationStateChange`() = runTest {
         // For now just call all the API. Later, add more valuable tests.
-        val appNavigationStateFlow: MutableStateFlow<AppNavigationState> = MutableStateFlow(
-            AppNavigationState(
-                navigationState = NavigationState.Root,
-                isInForeground = true,
-            )
-        )
-        val appNavigationStateService = FakeAppNavigationStateService(appNavigationState = appNavigationStateFlow)
+        val appNavigationStateService = FakeAppNavigationStateService()
         createDefaultNotificationDrawerManager(
             appNavigationStateService = appNavigationStateService
         )
-        appNavigationStateFlow.emit(AppNavigationState(aNavigationState(), isInForeground = true))
+        appNavigationStateService.emitNavigationState(AppNavigationState(aNavigationState(), isInForeground = true))
         runCurrent()
-        appNavigationStateFlow.emit(AppNavigationState(aNavigationState(A_SESSION_ID), isInForeground = true))
+        appNavigationStateService.emitNavigationState(AppNavigationState(aNavigationState(A_SESSION_ID), isInForeground = true))
         runCurrent()
-        appNavigationStateFlow.emit(AppNavigationState(aNavigationState(A_SESSION_ID, A_ROOM_ID), isInForeground = true))
+        appNavigationStateService.emitNavigationState(AppNavigationState(aNavigationState(A_SESSION_ID, A_ROOM_ID), isInForeground = true))
         runCurrent()
-        appNavigationStateFlow.emit(AppNavigationState(aNavigationState(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID), isInForeground = true))
+        appNavigationStateService.emitNavigationState(
+            AppNavigationState(
+                aNavigationState(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID),
+                isInForeground = true
+            )
+        )
         runCurrent()
         // Like a user sign out
-        appNavigationStateFlow.emit(AppNavigationState(aNavigationState(), isInForeground = true))
+        appNavigationStateService.emitNavigationState(AppNavigationState(aNavigationState(), isInForeground = true))
         runCurrent()
     }
 
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
index 8796d6a2ee..80efdff7ae 100644
--- a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
@@ -63,9 +63,9 @@ class DefaultAnalyticsRoomListStateWatcherTest {
 
     @Test
     fun `Opening the app in a cold state does nothing`() = runTest {
-        val navigationStateService = FakeAppNavigationStateService().apply {
-            appNavigationState.emit(AppNavigationState(NavigationState.Root, false))
-        }
+        val navigationStateService = FakeAppNavigationStateService(
+            initialAppNavigationState = AppNavigationState(NavigationState.Root, false)
+        )
         val roomListService = FakeRoomListService().apply {
             postState(RoomListService.State.Idle)
         }
diff --git a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
index 24b938d9a5..a8dc9f3086 100644
--- a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
+++ b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
@@ -31,7 +31,6 @@ import io.sentry.Sentry
 import io.sentry.SentryTracer
 import io.sentry.protocol.SentryId
 import io.sentry.protocol.SentryTransaction
-import kotlinx.coroutines.flow.MutableStateFlow
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -149,7 +148,7 @@ class SentryAnalyticsProviderTest {
                 )
             },
             appNavigationStateService = FakeAppNavigationStateService(
-                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+                initialAppNavigationState = AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true)
             )
         ).run {
             init()
@@ -182,7 +181,7 @@ class SentryAnalyticsProviderTest {
                 )
             },
             appNavigationStateService = FakeAppNavigationStateService(
-                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+                initialAppNavigationState = AppNavigationState(navigationState = NavigationState.Root, isInForeground = true)
             )
         ).run {
             init()
@@ -203,7 +202,7 @@ class SentryAnalyticsProviderTest {
                 )
             },
             appNavigationStateService = FakeAppNavigationStateService(
-                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+                initialAppNavigationState = AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true)
             )
         ).run {
             init()
@@ -221,7 +220,7 @@ class SentryAnalyticsProviderTest {
         buildMeta: BuildMeta = aBuildMeta(),
         getDatabaseSizesUseCase: GetDatabaseSizesUseCase = GetDatabaseSizesUseCase { Result.success(SdkStoreSizes(null, null, null, null)) },
         appNavigationStateService: FakeAppNavigationStateService = FakeAppNavigationStateService(
-            MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+            initialAppNavigationState = AppNavigationState(NavigationState.Session("owner", A_SESSION_ID), isInForeground = true)
         )
     ) = SentryAnalyticsProvider(
         context = InstrumentationRegistry.getInstrumentation().targetContext,
diff --git a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
index fd23b7c422..1e9289f0b5 100644
--- a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
+++ b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
@@ -15,15 +15,21 @@ import io.element.android.services.appnavstate.api.AppNavigationState
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import io.element.android.services.appnavstate.api.NavigationState
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 
 class FakeAppNavigationStateService(
-    override val appNavigationState: MutableStateFlow<AppNavigationState> = MutableStateFlow(
-        AppNavigationState(
-            navigationState = NavigationState.Root,
-            isInForeground = true,
-        )
+    initialAppNavigationState: AppNavigationState = AppNavigationState(
+        navigationState = NavigationState.Root,
+        isInForeground = true,
     ),
 ) : AppNavigationStateService {
+    private val _appNavigationState: MutableStateFlow<AppNavigationState> = MutableStateFlow(initialAppNavigationState)
+    override val appNavigationState = _appNavigationState.asStateFlow()
+
+    fun emitNavigationState(state: AppNavigationState) {
+        _appNavigationState.value = state
+    }
+
     override fun onNavigateToSession(owner: String, sessionId: SessionId) = Unit
     override fun onLeavingSession(owner: String) = Unit