diff --git a/apps/sv/frontend/src/components/form-components/DateField.tsx b/apps/sv/frontend/src/components/form-components/DateField.tsx
index af3723ac15..28456e6e54 100644
--- a/apps/sv/frontend/src/components/form-components/DateField.tsx
+++ b/apps/sv/frontend/src/components/form-components/DateField.tsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { useMemo } from 'react';
 import { Box, Typography } from '@mui/material';
 import { DesktopDateTimePicker, LocalizationProvider } from '@mui/x-date-pickers';
 import dayjs, { Dayjs } from 'dayjs';
@@ -19,6 +20,8 @@ export const DateField: React.FC<DateFieldProps> = props => {
   const { title, description, minDate, id } = props;
   const field = useFieldContext<string>();
 
+  const dateValue = useMemo(() => dayjs(field.state.value), [field.state.value]);
+
   return (
     <Box>
       {title && (
@@ -35,7 +38,7 @@ export const DateField: React.FC<DateFieldProps> = props => {
 
       <LocalizationProvider dateAdapter={AdapterDayjs}>
         <DesktopDateTimePicker
-          value={dayjs(field.state.value)}
+          value={dateValue}
           format={dateTimeFormatISO}
           minDateTime={minDate || dayjs()}
           ampm={false}