diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 290eb64c61..452174045b 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -275,7 +275,7 @@ export default class RhsComment extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12={true}
+                                        hour12={!Utils.isMilitaryTime()}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 9a207e4290..d56306d286 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -240,7 +240,7 @@ export default class RhsRootPost extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12={true}
+                                        hour12={!Utils.isMilitaryTime()}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx
index 85d069dbc8..7804cab7ba 100644
--- a/webapp/components/search_results_item.jsx
+++ b/webapp/components/search_results_item.jsx
@@ -100,7 +100,7 @@ export default class SearchResultsItem extends React.Component {
                                     <time className='search-item-time'>
                                         <FormattedDate
                                             value={post.create_at}
-                                            hour12={true}
+                                            hour12={!Utils.isMilitaryTime()}
                                             hour='2-digit'
                                             minute='2-digit'
                                         />
diff --git a/webapp/components/time_since.jsx b/webapp/components/time_since.jsx
index 9f7a93ceb1..f715193e2b 100644
--- a/webapp/components/time_since.jsx
+++ b/webapp/components/time_since.jsx
@@ -41,7 +41,7 @@ export default class TimeSince extends React.Component {
                     month='long'
                     day='numeric'
                     year='numeric'
-                    hour12={true}
+                    hour12={!Utils.isMilitaryTime()}
                     hour='numeric'
                     minute='2-digit'
                 />