diff --git a/ordinis-admin-ui/src/components/form/SchemaDrivenForm.tsx b/ordinis-admin-ui/src/components/form/SchemaDrivenForm.tsx
index be01a86..700db52 100644
--- a/ordinis-admin-ui/src/components/form/SchemaDrivenForm.tsx
+++ b/ordinis-admin-ui/src/components/form/SchemaDrivenForm.tsx
@@ -413,6 +413,22 @@ const FieldBody = ({
 
   if (isDateFormat(schema)) {
     const isDateTime = schema.format === 'date-time'
+    if (isDateTime) {
+      return (
+        <Controller
+          control={control}
+          name={`data.${fieldKey}` as `data.${string}`}
+          render={({ field }) => (
+            <DateTimeField
+              label={label}
+              value={field.value as string | undefined}
+              defaultTime="00:00"
+              onChange={(iso) => field.onChange(iso || undefined)}
+            />
+          )}
+        />
+      )
+    }
     return (
       <Controller
         control={control}
@@ -424,9 +440,7 @@ const FieldBody = ({
             hint={schema.description}
             error={errorMsg}
             value={parseFormDate(field.value)}
-            onChange={(d) =>
-              field.onChange(d ? (isDateTime ? formatIsoDateTime(d) : formatIsoDate(d)) : undefined)
-            }
+            onChange={(d) => field.onChange(d ? formatIsoDate(d) : undefined)}
           />
         )}
       />