diff --git a/demo/FormExamples.jsx b/demo/FormExamples.jsx
index b815a31..5e55947 100644
--- a/demo/FormExamples.jsx
+++ b/demo/FormExamples.jsx
@@ -112,7 +112,8 @@ export function FormExamples() {
         checkboxField2: true,
         radioField2: 'b',
         numberField: null,
-        dateField: new Date().toISOString(),
+        dateTimeField: new Date().toISOString(),
+        dateField2: new Date().toISOString(),
         dropdownField1: {
           title: 'Title two',
         },
@@ -212,7 +213,13 @@ export function FormExamples() {
           />
         </div>
         <div className="col">
-          <FormGroupInput name="dateField" label="Date field" type="datetime-local" />
+          <FormGroupInput name="dateTimeField" label="Datetime field" type="datetime-local" />
+        </div>
+        <div className="col">
+          <FormGroupInput name="dateField1" label="Date field" type="date" />
+        </div>
+        <div className="col">
+          <FormGroupInput name="dateField2" label="Date field with ISO date initialValue" type="date" />
         </div>
       </div>
 
diff --git a/demo/UncontrolledFormExamples.jsx b/demo/UncontrolledFormExamples.jsx
index b49eaab..c7a411d 100644
--- a/demo/UncontrolledFormExamples.jsx
+++ b/demo/UncontrolledFormExamples.jsx
@@ -37,6 +37,7 @@ export function UncontrolledFormExamples() {
           textarea1:
             'Lorem ipsum dolor sit amet consectetur adipisicing elit. Atque praesentium quisquam reiciendis expedita. Ad quod voluptas aliquid illum veniam odio? Nulla sed, illum eligendi amet fuga optio officia itaque nisi',
           dateMask: '0410202',
+          inputDate2: new Date().toISOString(),
         }}
         onSubmit={(data) => console.log('onSubmit', data)}
         onChange={(data) => console.log('onChange', data)}
@@ -117,7 +118,13 @@ export function UncontrolledFormExamples() {
           <FormArrayOfObjects />
         </div>
         <div className="mb-3">
-          <UncontrolledFormGroupInput label="Input date" name="inputDate" type="datetime-local" />
+          <UncontrolledFormGroupInput label="Input date time" name="inputDateTime" type="datetime-local" />
+        </div>
+        <div className="mb-3">
+          <UncontrolledFormGroupInput label="Input date" name="inputDate1" type="date" />
+        </div>
+        <div className="mb-3">
+          <UncontrolledFormGroupInput label="Input date with ISO date initialValue" name="inputDate2" type="date" />
         </div>
         <UncontrolledFormGroupAutocomplete
           name="autocomplete2Field1"
diff --git a/src/forms/FormInput.jsx b/src/forms/FormInput.jsx
index dd733aa..53dfeda 100644
--- a/src/forms/FormInput.jsx
+++ b/src/forms/FormInput.jsx
@@ -1,6 +1,8 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 
+import { isDateISOString } from 'js-var-type';
+
 import { formatClasses } from '../utils/attributes';
 
 import { useFormControl } from './helpers/useFormControl';
@@ -31,6 +33,11 @@ export function FormInput({
 
   if (type === 'datetime-local') {
     attrs.defaultValue = getValue();
+  } else if (type === 'date') {
+    const value = getValue();
+
+    //match em tudo antes do T da data ISO
+    attrs.value = isDateISOString(value) ? value.split('T')[0] : value;
   } else {
     attrs.value = getValue();
   }
diff --git a/src/uncontrolled-forms/UncontrolledFormInput.jsx b/src/uncontrolled-forms/UncontrolledFormInput.jsx
index 6276c60..de7d93f 100644
--- a/src/uncontrolled-forms/UncontrolledFormInput.jsx
+++ b/src/uncontrolled-forms/UncontrolledFormInput.jsx
@@ -1,6 +1,8 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 
+import { isDateISOString } from 'js-var-type';
+
 import { formatClasses } from '../utils/attributes';
 
 import { booleanOrFunction } from './helpers/form-helpers';
@@ -36,6 +38,11 @@ export function UncontrolledFormInput({
 
   if (type === 'datetime-local') {
     attrs.defaultValue = getValue() ?? '';
+  } else if (type === 'date') {
+    const value = getValue() ?? '';
+
+    //match em tudo antes do T da data ISO
+    attrs.value = isDateISOString(value) ? value.split('T')[0] : value;
   } else {
     attrs.value = getValue() ?? '';
   }