diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 10b707ebf67..e5cff943f2f 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1483,7 +1483,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             vals.get('allday', False),
             context=context)
         vals.update(updated_vals.get('value', {}))
-        vals['edit_all'] = False#.update(updated_vals.get('value', {}))
+
+        if not 'edit_all' in vals:
+            vals['edit_all'] = False
 
         if new_ids:
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)