diff --git a/website/server/middlewares/cron.js b/website/server/middlewares/cron.js
index 664d65cc3e..1b32b4c01b 100644
--- a/website/server/middlewares/cron.js
+++ b/website/server/middlewares/cron.js
@@ -74,10 +74,19 @@ async function cronAsync (req, res) {
     }
 
     const tasks = await Tasks.Task.find({
-      userId: user._id,
-      $or: [ // Exclude completed todos
-        { type: 'todo', completed: false },
-        { type: { $in: ['habit', 'daily', 'reward'] } },
+      $and: [
+        {
+          $or: [
+            { userId: user._id },
+            { userId: { $exists: false }, 'group.assignedUsers': user._id },
+          ],
+        },
+        {
+          $or: [ // Exclude completed todos
+            { type: 'todo', completed: false },
+            { type: { $in: ['habit', 'daily', 'reward'] } },
+          ],
+        },
       ],
     }).exec();