diff --git a/src/controls/editor/editform.js b/src/controls/editor/editform.js
index 10ceeb8b4..58640766c 100644
--- a/src/controls/editor/editform.js
+++ b/src/controls/editor/editform.js
@@ -86,9 +86,9 @@ const createForm = function createForm(obj) {
     }
     case 'date':
       if (!val) {
-        if (obj.defaultDate === false) {
+        if (obj.defaultDate === false || obj.defaultDate === 'undefined') {
           val = '';
-        } else if (obj.defaultDate) {
+        } else {
           val = isoDate.slice(0, 10);
         }
       }
@@ -99,32 +99,30 @@ const createForm = function createForm(obj) {
       break;
     case 'time':
       if (!val) {
-        if (obj.defaultTime === false) {
+        if (obj.defaultTime === false || obj.defaultDate === 'undefined') {
           val = '';
-        } else if (obj.defaultTime) {
+        } else {
           val = isoDate.slice(11, 19);
         }
       }
       if (val.endsWith('.000')) {
         val = val.slice(0, -4);
-      }
-      if (val.length > 8) {
+      } else if (val.length > 8) {
         val = val.slice(11, 19);
       }
       el = `<div class="validate ${cls}"><label>${label}</label><br><input type="time" name="timmar, minuter och sekunder" id="${id}" step="1" placeholder="--:--:--" value="${val}"${readonly}${required}></div>`;
       break;
     case 'datetime':
       if (!val) {
-        if (obj.defaultDatetime === false) {
+        if (obj.defaultDatetime === false || obj.defaultDate === 'undefined') {
           val = '';
-        } else if (obj.defaultDatetime) {
+        } else {
           val = isoDate.slice(0, 19);
         }
       }
       if (val.endsWith('.000')) {
         val = val.slice(0, -4);
-      }
-      if (val.length > 19) {
+      } else if (val.length > 19) {
         val = val.slice(0, 19);
       }
       el = `<div class="validate"><label>${label}</label><br><input type="datetime-local" name="datum och tid" id="${id}" step="1" placeholder="åååå-MM-dd --:--:--" value="${val}"${readonly}${required}></div>`;