diff --git a/services/analytics/impl/build.gradle.kts b/services/analytics/impl/build.gradle.kts
index 83eebead5d..d50d4c6228 100644
--- a/services/analytics/impl/build.gradle.kts
+++ b/services/analytics/impl/build.gradle.kts
@@ -33,5 +33,7 @@ dependencies {
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.analyticsproviders.test)
+    testImplementation(projects.services.toolbox.test)
 }
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
index 46870ccf74..4bb09a65da 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
@@ -24,7 +24,7 @@ import io.element.android.services.toolbox.api.systemclock.SystemClock
 @ContributesBinding(AppScope::class)
 class DefaultScreenTracker(
     private val analyticsService: AnalyticsService,
-    private val systemClock: SystemClock
+    private val systemClock: SystemClock,
 ) : ScreenTracker {
     @Composable
     override fun TrackScreen(
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt
new file mode 100644
index 0000000000..f5afffef28
--- /dev/null
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.analytics.impl
+
+import androidx.lifecycle.Lifecycle
+import app.cash.molecule.RecompositionMode
+import app.cash.molecule.moleculeFlow
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import im.vector.app.features.analytics.plan.MobileScreen
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import io.element.android.tests.testutils.FakeLifecycleOwner
+import io.element.android.tests.testutils.withFakeLifecycleOwner
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultScreenTrackerTest {
+    @Test
+    fun `TrackScreen is working as expected`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val systemClock = FakeSystemClock(150)
+        val lifecycleOwner = FakeLifecycleOwner()
+        val sut = createDefaultScreenTracker(
+            analyticsService = analyticsService,
+            systemClock = systemClock,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            withFakeLifecycleOwner(lifecycleOwner) {
+                sut.TrackScreen(MobileScreen.ScreenName.RoomMembers)
+            }
+        }.test {
+            // Screen resumes
+            lifecycleOwner.givenState(Lifecycle.State.RESUMED)
+            assertThat(awaitItem()).isEqualTo(Unit)
+            systemClock.epochMillisResult = 450
+            lifecycleOwner.givenState((Lifecycle.State.DESTROYED))
+        }
+        assertThat(analyticsService.screenEvents).containsExactly(
+            MobileScreen(
+                screenName = MobileScreen.ScreenName.RoomMembers,
+                durationMs = 300,
+            )
+        )
+    }
+}
+
+private fun createDefaultScreenTracker(
+    analyticsService: AnalyticsService = FakeAnalyticsService(),
+    systemClock: SystemClock = FakeSystemClock(),
+) = DefaultScreenTracker(
+    analyticsService = analyticsService,
+    systemClock = systemClock,
+)