diff --git a/app/DD-Record-Organizer/ClassControlValues.vb b/app/DD-Record-Organizer/ClassControlValues.vb
index eba83dd..f1664a3 100644
--- a/app/DD-Record-Organizer/ClassControlValues.vb
+++ b/app/DD-Record-Organizer/ClassControlValues.vb
@@ -32,7 +32,7 @@ Public Class ClassControlValues
 
             Case GetType(DevExpress.XtraEditors.DateEdit)
                 Dim datepicker As DevExpress.XtraEditors.DateEdit = DirectCast(control, DevExpress.XtraEditors.DateEdit)
-                If IsDBNull(datepicker.EditValue) Then
+                If IsDBNull(datepicker.EditValue) Or datepicker.EditValue = DateTime.MinValue Then
                     Return False
                 Else
                     Return True
@@ -627,8 +627,7 @@ Public Class ClassControlValues
                 DirectCast(control, RadioButton).Checked = False
 
             Case GetType(DevExpress.XtraEditors.DateEdit)
-                DirectCast(control, DevExpress.XtraEditors.DateEdit).DateTime = Now
-
+                DirectCast(control, DevExpress.XtraEditors.DateEdit).DateTime = DateTime.MinValue
             Case GetType(PictureBox)
                 DirectCast(control, PictureBox).BackgroundImage = Nothing