diff --git a/4chan_x.js b/4chan_x.js
index 460957cdf..2ca70e92c 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -1654,7 +1654,7 @@
           meridiem = '';
           if ($.config('Localized am/pm')) {
             meridiem = hour < 12 ? ' a.m.' : ' p.m.';
-            hour = hour === 0 ? 12 : hour > 12 ? hour - 12 : void 0;
+            hour = hour % 12 || 12;
           }
           date = new Date(year, month, day, hour);
           year = date.getFullYear() - 2000;
diff --git a/script.coffee b/script.coffee
index f85b9a4de..02d218ec7 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1333,7 +1333,7 @@ localize =
         meridiem = ''
         if $.config 'Localized am/pm'
           meridiem = if hour < 12 then ' a.m.' else ' p.m.'
-          hour = if hour is 0 then 12 else if hour > 12 then hour - 12
+          hour = hour % 12 or 12
         date = new Date year, month, day, hour
         year = date.getFullYear() - 2000
         month = $.zeroPad date.getMonth() + 1