diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt
index 37e6cae..3252cba 100644
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt
@@ -159,7 +159,6 @@ import de.jeanlucmakiola.calendula.ui.common.eventFormFieldLabel
 import de.jeanlucmakiola.floret.components.FullScreenPicker
 import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.floret.components.GroupedSurface
-import de.jeanlucmakiola.calendula.ui.common.MILLIS_PER_DAY
 import de.jeanlucmakiola.floret.components.InlineTextField
 import de.jeanlucmakiola.floret.components.OptionCard
 import de.jeanlucmakiola.floret.components.OptionPicker
@@ -1910,9 +1909,8 @@ private fun RecurrencePickerDialog(
 
     if (showUntilPicker) {
         CalendarDatePickerDialog(
-            initial = untilDate ?: LocalDate.fromEpochDays(
-                (Clock.System.now().toEpochMilliseconds() / MILLIS_PER_DAY).toInt(),
-            ),
+            initial = untilDate
+                ?: Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date,
             onConfirm = {
                 untilIso = it.toString()
                 showUntilPicker = false