diff --git a/src/components/FormField/components/Datepicker/index.js b/src/components/FormField/components/Datepicker/index.js
index a82eeae..2f6d83b 100644
--- a/src/components/FormField/components/Datepicker/index.js
+++ b/src/components/FormField/components/Datepicker/index.js
@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { classNames } from 'primereact/utils';
 import { Controller } from 'react-hook-form';
+import { is } from 'ramda';
 
 import { Calendar } from 'primereact/calendar';
 
@@ -30,7 +31,7 @@ const Datepicker = ({
                 render={({ field, fieldState }) => (
                     <Calendar id={field.name}
                               disabled={disabled}
-                              value={field.value ?? []}
+                              value={is(String, field.value) ? new Date(field.value) : field.value}
                               onChange={(e) => field.onChange(e.value)}
                               dateFormat="dd/mm/yy"
                               hourFormat="24"