diff --git a/packages/netlify-cms-core/src/actions/entries.js b/packages/netlify-cms-core/src/actions/entries.js
index 13f2a0f3..e914f393 100644
--- a/packages/netlify-cms-core/src/actions/entries.js
+++ b/packages/netlify-cms-core/src/actions/entries.js
@@ -379,24 +379,21 @@ function createEmptyDraftData(fields) {
   return fields.reduce((acc, item) => {
     const subfields = item.get('field') || item.get('fields');
     const list = item.get('widget') == 'list';
-    const defaultValue = item.get('default');
+    const name = item.get('name');
+    const defaultValue = item.get('default', null);
 
     if (List.isList(subfields)) {
-      acc[item.get('name')] = list
-        ? [createEmptyDraftData(subfields)]
-        : createEmptyDraftData(subfields);
+      acc[name] = list ? [createEmptyDraftData(subfields)] : createEmptyDraftData(subfields);
       return acc;
     }
 
     if (Map.isMap(subfields)) {
-      acc[item.get('name')] = list
-        ? [createEmptyDraftData([subfields])]
-        : createEmptyDraftData([subfields]);
+      acc[name] = list ? [createEmptyDraftData([subfields])] : createEmptyDraftData([subfields]);
       return acc;
     }
 
-    if (defaultValue) {
-      acc[item.get('name')] = defaultValue;
+    if (defaultValue !== null) {
+      acc[name] = defaultValue;
     }
 
     return acc;
diff --git a/packages/netlify-cms-widget-date/src/DateControl.js b/packages/netlify-cms-widget-date/src/DateControl.js
index 63c978a0..9ce25393 100644
--- a/packages/netlify-cms-widget-date/src/DateControl.js
+++ b/packages/netlify-cms-widget-date/src/DateControl.js
@@ -30,7 +30,9 @@ export default class DateControl extends React.Component {
      * empty string means the value is intentionally blank.
      */
     if (!value && value !== '') {
-      this.handleChange(new Date());
+      setTimeout(() => {
+        this.handleChange(new Date());
+      }, 0);
     }
   }