diff --git a/components/DateInput.vue b/components/DateInput.vue
index 288e4f77..6cb9290a 100644
--- a/components/DateInput.vue
+++ b/components/DateInput.vue
@@ -210,7 +210,11 @@ export default {
       if (what === 'type') {
         if (typeof value === 'undefined') { this.type = 'normal' }
         if (value === 'recurrent') {
-          this.$emit('input', { ...this.value, due: null, recurrent: { frequency: '1w' }, multidate: false })
+          if (this.value.multidate && this.value.due) {
+            this.$emit('input', { ...this.value, due: this.value.from, recurrent: { frequency: '1w' }, multidate: false })
+          } else {
+            this.$emit('input', { ...this.value, recurrent: { frequency: '1w' }, multidate: false })
+          }
         } else if (value === 'multidate') {
           this.$emit('input', { ...this.value, recurrent: null, multidate: true })
         } else {
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 50481268..68740b2c 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -259,7 +259,7 @@ export default {
       formData.append('start_datetime', this.$time.fromDateInput(this.date.from, this.date.fromHour))
       if (!!this.date.multidate) {
         formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour || '23:59'))
-      } else if (this.date.dueHour) {
+      } else if (this.date.dueHour && this.date.due) {
         formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour))
       } else {
         formData.append('end_datetime', '')