diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
index 6a09398f0..11d4fb258 100644
--- a/app/src/View/Helper/FieldHelper.php
+++ b/app/src/View/Helper/FieldHelper.php
@@ -348,6 +348,10 @@ public function dateField(string $fieldName,
     // Get the existing values, if present
     if($date_object !== null) {
       // Adjust the time back to the user's timezone
+      $tz = $this->getView()->get('vv_tz');
+      if($tz) {
+        $date_object = $date_object->setTimezone($tz);
+      }
       $coptions['value'] = $date_object->i18nFormat($dateFormat);
       $pickerDate = $date_object->i18nFormat($dateFormat);
     }