diff --git a/src/common/phase-helper.js b/src/common/phase-helper.js
index af23b4bb..6a753098 100644
--- a/src/common/phase-helper.js
+++ b/src/common/phase-helper.js
@@ -249,7 +249,7 @@ class ChallengePhaseHelper {
       if (updatedPhase.name === "Post-Mortem") {
         updatedPhase.predecessor = "a93544bc-c165-4af4-b55e-18f3593b457a";
       }
-      if (_.undefined(updatedPhase.actualEndDate) && updatedPhase.name !== "Iterative Review") {
+      if (_.isUndefined(updatedPhase.actualEndDate) && updatedPhase.name !== "Iterative Review") {
         updatedPhase.duration = _.defaultTo(_.get(newPhase, "duration"), updatedPhase.duration);
       }
       if (_.isUndefined(updatedPhase.predecessor)) {
@@ -298,13 +298,15 @@ class ChallengePhaseHelper {
           }
           iterativeReviewSet = true;
         }
-      } else {
+      } else if (_.isUndefined(phase.actualStartDate)) {
         phase.scheduledStartDate = predecessorPhase.scheduledEndDate;
       }
-      phase.scheduledEndDate = moment(phase.scheduledStartDate)
+      if (_.isUndefined(phase.actualEndDate)) {
+        phase.scheduledEndDate = moment(phase.scheduledStartDate)
         .add(phase.duration, "seconds")
         .toDate()
         .toISOString();
+      }
     }
     return updatedPhases;
   }