diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index 8374040c32..30b467247c 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -76,6 +76,11 @@
 				}
 			}
 			
+			if($start[hour] > 24)
+			{
+				$start[hour] -= 12;
+			}
+			
 			if ($end[ampm] == 'pm')
 			{
 				if ($end[hour] <> 12)
@@ -90,6 +95,11 @@
 					$end[hour] -= 12;
 				}
 			}
+			
+			if($end[hour] > 24)
+			{
+				$end[hour] -= 12;
+			}
 		}
 
 		if(!isset($private))