diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 79039b8d9c..ddea681b99 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1215,6 +1215,14 @@ class calendar_boupdate extends calendar_bo
 			{
 				$event['deleted'] = true;
 				$this->save($event);
+				// Actually delete alarms
+				if (isset($event['alarm']) && is_array($event['alarm']))
+				{
+					foreach($event['alarm'] as $id => $alarm)
+					{
+						$this->delete_alarm($id);
+					}
+				}
 			}
 			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'delete',time());