diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/focus/FocusServiceViewModel.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/focus/FocusServiceViewModel.kt
index cd87988a..4e95070b 100644
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/focus/FocusServiceViewModel.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/focus/FocusServiceViewModel.kt
@@ -22,7 +22,7 @@ class FocusServiceViewModel(
     init {
         launchScoped {
             servicesRepository.observeServicesTicker()
-                .map { it.first { it.id == serviceId } }
+                .map { it.firstOrNull { it.id == serviceId } }
                 .collect { service ->
                     uiState.update { it.copy(service = service) }
                 }