diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 70e7a2edd..f68d38861 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -267,11 +267,6 @@ class TaskEditViewModel @Inject constructor(
             taskDao.createNew(task)
         }
 
-        if (isNew || originalList != selectedList.value) {
-            task.parent = 0
-            taskMover.move(listOf(task.id), selectedList.value)
-        }
-
         if ((isNew && selectedLocation.value != null) || originalLocation != selectedLocation.value) {
             originalLocation?.let { location ->
                 if (location.geofence.id > 0) {
@@ -338,6 +333,11 @@ class TaskEditViewModel @Inject constructor(
 
         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())