diff --git a/example/lib/main.dart b/example/lib/main.dart
index e123051..670f14f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -57,7 +57,7 @@ class _MyHomePageState extends State<MyHomePage> {
                   },
                 ),
                 FlutterFormInputDateTime(
-                  inputType: FlutterFormDateTimeType.dateTime,
+                  inputType: FlutterFormDateTimeType.date,
                   dateFormat: DateFormat('dd/MM/yyyy HH:mm'),
                   onChanged: (v) {
                     print('Date changed to $v');
diff --git a/lib/src/inputs/date_picker/date_picker_field.dart b/lib/src/inputs/date_picker/date_picker_field.dart
index 2361c02..b06e268 100644
--- a/lib/src/inputs/date_picker/date_picker_field.dart
+++ b/lib/src/inputs/date_picker/date_picker_field.dart
@@ -128,7 +128,7 @@ class _DateInputFieldState extends ConsumerState<DateTimeInputField> {
       keyboardType: TextInputType.none,
       readOnly: true,
       key: Key(currentValue.toString()),
-      initialValue: widget.initialValue,
+      initialValue: currentValue.isEmpty ? widget.initialValue : currentValue,
       onSaved: (value) => widget.onSaved?.call(value),
       onTap: () async {
         String userInput = await getInputFromUser(widget.inputType);