diff --git a/src/js/clock.js b/src/js/clock.js
index 3c57a882..d2e5b04c 100644
--- a/src/js/clock.js
+++ b/src/js/clock.js
@@ -34,6 +34,9 @@ var clock = (function() {
             if (!state.get.current().header.clock.hour24.show && timeDateNow.hours() > 12) {
               timeStrings.hours = timeStrings.hours - 12;
             };
+            if (!state.get.current().header.clock.hour24.show && timeDateNow.hours() == 0) {
+              timeStrings.hours = 12;
+            };
             timeStrings.hours = helper.toWords(timeStrings.hours);
             if (state.get.current().header.clock.hour24.show && timeDateNow.hours() > 0 && timeDateNow.hours() < 10) {
               timeStrings.hours = "Zero " + timeStrings.hours;
@@ -44,6 +47,9 @@ var clock = (function() {
             if (!state.get.current().header.clock.hour24.show && timeDateNow.hours() > 12) {
               timeStrings.hours = timeStrings.hours - 12;
             };
+            if (!state.get.current().header.clock.hour24.show && timeDateNow.hours() == 0) {
+              timeStrings.hours = 12;
+            };
             if (state.get.current().header.clock.hour24.show && timeDateNow.hours() < 10) {
               timeStrings.hours = "0" + timeStrings.hours;
             };