diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index 7ac329b5..f1e159e8 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -1617,17 +1617,16 @@ async function updateChallenge(currentUser, challengeId, data) {
   const finalStatus = data.status || challenge.status;
   const finalTimelineTemplateId = data.timelineTemplateId || challenge.timelineTemplateId;
   let timelineTemplateChanged = false;
-  // if (!_.get(data, "legacy.pureV5") && !_.get(challenge, "legacy.pureV5")) {
-  //   if (
-  //     finalStatus !== constants.challengeStatuses.New &&
-  //     finalTimelineTemplateId !== challenge.timelineTemplateId
-  //   ) {
-  //     throw new errors.BadRequestError(
-  //       `Cannot change the timelineTemplateId for challenges with status: ${finalStatus}`
-  //     );
-  //   }
-  // } else
-  if (finalTimelineTemplateId !== challenge.timelineTemplateId) {
+  if (!_.get(data, "legacy.pureV5") && !_.get(challenge, "legacy.pureV5")) {
+    if (
+      finalStatus !== constants.challengeStatuses.New &&
+      finalTimelineTemplateId !== challenge.timelineTemplateId
+    ) {
+      throw new errors.BadRequestError(
+        `Cannot change the timelineTemplateId for challenges with status: ${finalStatus}`
+      );
+    }
+  } else if (finalTimelineTemplateId !== challenge.timelineTemplateId) {
     // make sure there are no previous phases if the timeline template has changed
     challenge.phases = [];
     timelineTemplateChanged = true;