diff --git a/src/dashboard/Data/Config/Config.react.js b/src/dashboard/Data/Config/Config.react.js
index 1f1b7121c8..22a6383c9d 100644
--- a/src/dashboard/Data/Config/Config.react.js
+++ b/src/dashboard/Data/Config/Config.react.js
@@ -235,10 +235,14 @@ class Config extends TableView {
         params.forEach((value, param) => {
           const masterKeyOnly = masterKeyOnlyParams.get(param) || false;
           const type = typeof value;
-          if (type === 'object' && value.__type == 'File') {
-            value = Parse.File.fromJSON(value);
-          } else if (type === 'object' && value.__type == 'GeoPoint') {
-            value = new Parse.GeoPoint(value);
+          if (type === 'object' && value !== null) {
+            if (value.__type == 'File') {
+              value = Parse.File.fromJSON(value);
+            } else if (value.__type == 'GeoPoint') {
+              value = new Parse.GeoPoint(value);
+            } else if (value.__type == 'Date') {
+              value = new Date(value.iso)
+            }
           }
           data.push({
             param: param,
diff --git a/src/dashboard/Data/Config/ConfigDialog.react.js b/src/dashboard/Data/Config/ConfigDialog.react.js
index 7d13d239cb..9b9797aed5 100644
--- a/src/dashboard/Data/Config/ConfigDialog.react.js
+++ b/src/dashboard/Data/Config/ConfigDialog.react.js
@@ -120,6 +120,9 @@ export default class ConfigDialog extends React.Component {
       case 'Number':
         return !isNaN(parseFloat(this.state.value));
       case 'Date':
+        if (this.state.value === null || this.state.value === undefined || this.state.value === '') {
+          return false;
+        }
         return !isNaN(new Date(this.state.value));
       case 'Object':
         try {