diff --git a/test/api/v3/unit/models/challenge.test.js b/test/api/v3/unit/models/challenge.test.js
index 49f0ce9283..18e7de7bcf 100644
--- a/test/api/v3/unit/models/challenge.test.js
+++ b/test/api/v3/unit/models/challenge.test.js
@@ -74,14 +74,15 @@ describe('Challenge Model', () => {
       it('adds tasks to challenge and challenge members', async () => {
         await challenge.addTasks([task]);
 
-        let updatedLeader = await User.findOne({_id: leader._id});
-        let updatedLeadersTasks = await Tasks.Task.find({_id: { $in: updatedLeader.tasksOrder[`${taskType}s`]}});
-        let syncedTask = find(updatedLeadersTasks, function findNewTask (updatedLeadersTask) {
+        const updatedLeader = await User.findOne({_id: leader._id});
+        const updatedLeadersTasks = await Tasks.Task.find({_id: { $in: updatedLeader.tasksOrder[`${taskType}s`]}});
+        const syncedTask = find(updatedLeadersTasks, function findNewTask (updatedLeadersTask) {
           return updatedLeadersTask.type === taskValue.type && updatedLeadersTask.text === taskValue.text;
         });
 
         expect(syncedTask).to.exist;
         expect(syncedTask.notes).to.eql(task.notes);
+        expect(syncedTask.tags[0]).to.eql(challenge._id);
       });
 
       it('syncs a challenge to a user', async () => {
diff --git a/website/server/models/challenge.js b/website/server/models/challenge.js
index 5f97c655aa..9a48c1b455 100644
--- a/website/server/models/challenge.js
+++ b/website/server/models/challenge.js
@@ -182,7 +182,10 @@ async function _addTaskFn (challenge, tasks, memberId) {
     let userTask = new Tasks[chalTask.type](Tasks.Task.sanitize(syncableAttrs(chalTask)));
     userTask.challenge = {taskId: chalTask._id, id: challenge._id, shortName: challenge.shortName};
     userTask.userId = memberId;
-    userTask.notes = chalTask.notes; // We want to sync the notes when the task is first added to the challenge
+
+    // We want to sync the notes and tags when the task is first added to the challenge
+    userTask.notes = chalTask.notes;
+    userTask.tags.push(challenge._id);
 
     let tasksOrderList = updateTasksOrderQ.$push[`tasksOrder.${chalTask.type}s`];
     if (!tasksOrderList) {