diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
index aafd9dd..f94e8cf 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
@@ -89,11 +89,9 @@ class TimerViewModel(
             val today = LocalDate.now()
 
             // Fills dates between today and lastDate with 0s to ensure continuous history
-            lastDate?.until(today)?.days?.let {
-                while (it > 0) {
-                    lastDate = lastDate?.plusDays(1)
-                    statRepository.insertStat(Stat(lastDate!!, 0, 0, 0, 0, 0))
-                }
+            while ((lastDate?.until(today)?.days ?: -1) > 0) {
+                lastDate = lastDate?.plusDays(1)
+                statRepository.insertStat(Stat(lastDate!!, 0, 0, 0, 0, 0))
             }
 
             delay(1500)