diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index f68d38861..76af6e8fb 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -293,6 +293,20 @@ class TaskEditViewModel @Inject constructor(
             task.modificationDate = currentTimeMillis()
         }
 
+        if (!task.hasStartDate()) {
+            selectedAlarms.value = selectedAlarms.value.filterNot { a -> a.type == TYPE_REL_START }
+        }
+        if (!task.hasDueDate()) {
+            selectedAlarms.value = selectedAlarms.value.filterNot { a -> a.type == TYPE_REL_END }
+        }
+
+        taskDao.save(task, null)
+
+        if (isNew || originalList != selectedList.value) {
+            task.parent = 0
+            taskMover.move(listOf(task.id), selectedList.value)
+        }
+
         for (subtask in newSubtasks.value) {
             if (Strings.isNullOrEmpty(subtask.title)) {
                 continue
@@ -324,20 +338,6 @@ class TaskEditViewModel @Inject constructor(
             }
         }
 
-        if (!task.hasStartDate()) {
-            selectedAlarms.value = selectedAlarms.value.filterNot { a -> a.type == TYPE_REL_START }
-        }
-        if (!task.hasDueDate()) {
-            selectedAlarms.value = selectedAlarms.value.filterNot { a -> a.type == TYPE_REL_END }
-        }
-
-        taskDao.save(task, null)
-
-        if (isNew || originalList != selectedList.value) {
-            task.parent = 0
-            taskMover.move(listOf(task.id), selectedList.value)
-        }
-
         if (
             selectedAlarms.value.toHashSet() != originalAlarms.toHashSet() ||
             (isNew && selectedAlarms.value.isNotEmpty())