diff --git a/data/epplets/clock/clock.fe b/data/epplets/clock/clock.fe
index 1ff584f5f..4f4a45180 100644
--- a/data/epplets/clock/clock.fe
+++ b/data/epplets/clock/clock.fe
@@ -21,7 +21,8 @@ function clock_update(object data, number val){
   string seconds = String.copySection(time,6,8);
   string timeofday = "AM";
 
-  if(hour>12){
+  if(hour==0) hour = 12;
+  else if(hour>12){
     timeofday = "PM";
     hour = hour - 12;
   }