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