diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js b/x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
index b6bd4922f845c..16407c3a97e4d 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
@@ -81,6 +81,7 @@ export class TimeRangeSelector extends Component {
           <EuiDatePicker
             selected={datePickerTimes.start}
             onChange={this.setStartTime}
+            maxDate={datePickerTimes.end}
             inline
             showTimeSelect
           />)
@@ -93,6 +94,7 @@ export class TimeRangeSelector extends Component {
           <EuiDatePicker
             selected={datePickerTimes.end}
             onChange={this.setEndTime}
+            minDate={datePickerTimes.start}
             inline
             showTimeSelect
           />)
diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_modal.html b/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_modal.html
index 7d31ac6565bd6..6c114923518b5 100644
--- a/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_modal.html
+++ b/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_modal.html
@@ -51,6 +51,7 @@ <h3 class="euiTitle">Create new event</h3>
               <datepicker
                 offset-timezone
                 ng-model="ui.timepicker.start"
+                max-date="ui.timepicker.end"
                 show-weeks="false">
               </datepicker>
               <div class="partition"></div>
@@ -62,6 +63,7 @@ <h3 class="euiTitle">Create new event</h3>
               <datepicker
                 offset-timezone
                 ng-model="ui.timepicker.end"
+                min-date="ui.timepicker.start"
                 show-weeks="false">
               </datepicker>
             </div>
@@ -80,6 +82,7 @@ <h3 class="euiTitle">Create new event</h3>
               <datepicker
                 offset-timezone
                 ng-model="ui.timepicker.start"
+                max-date="ui.timepicker.end"
                 show-weeks="false">
               </datepicker>
               <div class="partition partition-large"></div>
@@ -94,6 +97,7 @@ <h3 class="euiTitle">Create new event</h3>
               <datepicker
                 offset-timezone
                 ng-model="ui.timepicker.end"
+                min-date="ui.timepicker.start"
                 show-weeks="false">
               </datepicker>
             </div>