diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index df0c8d3f23..f1738c4b19 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1092,7 +1092,10 @@ ORDER BY cal_user_type, cal_usre_id
 					{
 						$alarm['time'] = $time;
 					}
-					else continue;
+					elseif (!$next_occurrence)
+					{
+						continue;
+					}
 				}
 				$this->save_alarm($cal_id,$alarm);
 			}