diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index f3ca9beb39..5326bfcc05 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -306,7 +306,6 @@ class calendar_so
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
-			$where['cal_recurrence'] = 0;
 		}
 		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
 		{
diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 34e09c7ad0..04c637ce10 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -672,7 +672,7 @@ class calendar_uiforms extends calendar_ui
 				else	// conflict or error, we need to reset everything to the state befor we tried to save it
 				{
 					$event['id'] = $event['reference'];
-					unset($event['reference']);
+					$event['reference'] = $event['recurrence'] = 0;
 					$event['uid'] = $content['uid'];
 				}
 			}
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index 579ef3fcaa..5054c1f4db 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2310,7 +2310,7 @@ function calendar_upgrade14_1()
 {
 	$GLOBALS['egw_setup']->db->query(
 "UPDATE egw_cal
-SET cal_reference=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
+SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
 	foreach($GLOBALS['egw_setup']->db->query(