diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
index abca69d..a637111 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
@@ -336,9 +336,8 @@ class SettingsViewModel(
 
         settingsState = _settingsState.value
 
-        time.update { settingsState.focusTime }
-
-        if (!stateRepository.timerState.value.serviceRunning)
+        if (!stateRepository.timerState.value.serviceRunning) {
+            time.update { settingsState.focusTime }
             stateRepository.timerState.update { currentState ->
                 currentState.copy(
                     timerMode = TimerMode.FOCUS,
@@ -350,6 +349,7 @@ class SettingsViewModel(
                     totalFocusCount = settingsState.sessionLength
                 )
             }
+        }
     }
 
     private fun refreshTimer() {