diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index 4736844f..25b6faae 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -836,6 +836,10 @@ class ChallengeEditor extends Component {
             newChallenge.phases[phaseIndex]['scheduledEndDate'] = lastDate
           }
 
+          if (moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).isAfter(phases[phaseIndex]['scheduledStartDate'])) {
+            newChallenge.phases[phaseIndex]['scheduledStartDate'] = moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).subtract('1', 'hour').format('MM/DD/YYYY HH:mm')
+          }
+
           newChallenge.phases[phaseIndex]['duration'] =
           moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).diff(newChallenge.phases[phaseIndex]['scheduledStartDate'], 'hours')
         }
diff --git a/src/components/DurationInput/index.js b/src/components/DurationInput/index.js
index 0ce34f99..ea2c2c78 100644
--- a/src/components/DurationInput/index.js
+++ b/src/components/DurationInput/index.js
@@ -12,7 +12,7 @@ const DurationInput = ({ duration, onDurationChange, index, isActive }) => {
         id={`duration-${index}`}
         key={`duration-${index}`}
         ref={inputRef}
-        min={0}
+        min={1}
         type='number'
         value={Number(duration).toString()}
         onChange={e => {