diff --git a/src/js/actions.ts b/src/js/actions.ts
index fe91d55bc..e355d758f 100644
--- a/src/js/actions.ts
+++ b/src/js/actions.ts
@@ -134,7 +134,7 @@ export default class Actions {
         break;
       case ActionTypes.selectHour:
         let hour = +currentTarget.getAttribute('data-value');
-        if (lastPicked.hours >= 12) hour += 12;
+        if (lastPicked.hours >= 12 && !this._context._options.display.components.useTwentyfourHour) hour += 12;
         lastPicked.hours = hour;
         this._context.dates._setValue(
           lastPicked,