diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
index 9fa2a6e4079e0b20b5c4d178a273b5d8e671deac..8c2cee8834b8484a2c07c9ddfb4da790215195f8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
@@ -25,7 +25,6 @@ import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
-import org.joda.time.DateTimeZone
 import org.joda.time.Duration
 import org.joda.time.LocalDate
 import org.joda.time.LocalDateTime
@@ -160,14 +159,14 @@ class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_frag
         MaterialDatePicker
             .Builder
             .datePicker()
-            .setSelection(defaultValue?.toDateTime(DateTimeZone.UTC)?.millis)
+            .setSelection(defaultValue?.toDateTime()?.millis)
             .apply {
                 if (minConstraint != null) {
                     setCalendarConstraints(
                         CalendarConstraints.Builder()
                             .setValidator(
                                 DateValidatorPointForward
-                                    .from(minConstraint.withMillisOfDay(0).toDateTime(DateTimeZone.UTC).millis)
+                                    .from(minConstraint.withMillisOfDay(0).toDateTime().millis)
                             )
                             .build()
                     )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
index 55a2af7908ad3c6ac7486287e62fb4af892c8a0a..da0c661715bac8e462d43a71c31ca012a5012c24 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
@@ -19,7 +19,6 @@ import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
 import de.rki.coronawarnapp.util.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import org.joda.time.DateTimeZone
 import org.joda.time.Duration
 import org.joda.time.LocalDateTime
 import timber.log.Timber
@@ -64,8 +63,8 @@ class TraceLocationCreateViewModel @AssistedInject constructor(
             type = category.type,
             description = description,
             address = address,
-            startDate = begin?.toDateTime(DateTimeZone.UTC)?.toInstant(),
-            endDate = end?.toDateTime(DateTimeZone.UTC)?.toInstant(),
+            startDate = begin?.toDateTime()?.toInstant(),
+            endDate = end?.toDateTime()?.toInstant(),
             defaultCheckInLengthInMinutes = checkInLength.standardMinutes.toInt()
         )