diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js
index 7f9ae7463c..bfda9aed8d 100644
--- a/website/server/libs/tasks/index.js
+++ b/website/server/libs/tasks/index.js
@@ -270,7 +270,6 @@ async function getTasks (req, res, options = {}) {
     remove(taskOrder, taskId => tasks.findIndex(task => task._id === taskId) === -1);
     if (preLength !== taskOrder.length) {
       owner.tasksOrder[key] = taskOrder;
-      owner.markModified('tasksOrder');
       ownerDirty = true;
     }
   });
@@ -303,7 +302,17 @@ async function getTasks (req, res, options = {}) {
     }
   });
 
-  if (ownerDirty) await owner.save();
+  if (ownerDirty) {
+    let model;
+    if (challenge) {
+      model = Challenge;
+    } else if (group) {
+      model = Group;
+    } else {
+      model = User;
+    }
+    await model.updateOne({ _id: owner._id }, { tasksOrder: owner.tasksOrder }).exec();
+  }
 
   // Remove empty values from the array and add any unordered task
   orderedTasks = compact(orderedTasks).concat(unorderedTasks);
diff --git a/website/server/libs/tasks/utils.js b/website/server/libs/tasks/utils.js
index 5a0c465e6a..bd8d07f323 100644
--- a/website/server/libs/tasks/utils.js
+++ b/website/server/libs/tasks/utils.js
@@ -82,7 +82,7 @@ export function setNextDue (task, user, dueDateOption) {
     now = dateTaskIsDue;
   }
 
-  const optionsForShouldDo = user.preferences.toObject();
+  const optionsForShouldDo = user.preferences;
   optionsForShouldDo.now = now;
   task.isDue = shared.shouldDo(dateTaskIsDue, task, optionsForShouldDo);