diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 90451a4390..868eb3afa6 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -757,6 +757,12 @@
 			}
 			print_debug('ID',$l_cal['id']);
 
+			// don't wrap to the next day for no time
+			if ($l_end['hour'] == 24 || $l_end['min'] == 0) {
+				$l_end['hour'] = 23;
+				$l_end['min'] = 59;
+            }
+
 			if(isset($_GET['readsess']))
 			{
 				$event = $this->restore_from_appsession();