diff --git a/client/app/components/date-time-picker.js b/client/app/components/date-time-picker.js
index 5090e6ae..934c96be 100644
--- a/client/app/components/date-time-picker.js
+++ b/client/app/components/date-time-picker.js
@@ -90,6 +90,8 @@ export default class DateTimePickerComponent extends Component {
       if (this.timeOfDay === 'PM') {
         const pmHour = parseInt(this.hour, 10) === 12 ? 12 : parseInt(this.hour, 10) + 12;
         numberHour = pmHour;
+      } else if (parseInt(this.hour, 10) === 12) {
+        numberHour = 0;
       } else {
         numberHour = this.hour;
       }