diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
index 2bf7703da..d27d2bd72 100644
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
@@ -190,8 +190,8 @@ const FleetFormDialog = ({
           label={field.label}
           placeholder={field.placeholder || "Click to select a date"}
           value={dateValue}
-          onChange={(date) => {
-            if (!date) {
+          onChange={(date: Date | null) => {
+            if (!date || !(date instanceof Date)) {
               setValues((current) => ({ ...current, [field.name]: "" }));
             } else {
               const isoDate = date.toISOString().split("T")[0];
@@ -202,10 +202,10 @@ const FleetFormDialog = ({
           disabled={field.disabled}
           minDate={new Date(1900, 0, 1)}
           maxDate={new Date()}
-          clearable
-          valueFormat="YYYY-MM-DD"
           firstDayOfWeek={0}
           description={field.description || "Select a date"}
+          dropdownType="modal"
+          clearable
         />
       );
     }