diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 60ee34c12..35a29219a 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1428,7 +1428,8 @@ iRANGE(2);
 
 - (void) setComponentCalendar: (SOGoAppointmentFolder *) _componentCalendar
 {
-  ASSIGN(componentCalendar, _componentCalendar);
+  if (_componentCalendar)
+    ASSIGN(componentCalendar, _componentCalendar);
 }
 
 /* priorities */
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 75eaa046e..016175578 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -8,6 +8,7 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
   className="UIxComponentEditor"
+  componentCalendar="componentCalendar"
   eventIsReadOnly="eventIsReadOnly"
   var:component="event"
   var:rsvpURL="rsvpURL"
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index b218023c0..770713cd0 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -8,6 +8,7 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
   className="UIxComponentEditor"
+  componentCalendar="componentCalendar"
   eventIsReadOnly="eventIsReadOnly"
   var:component="todo"
   var:saveURL="saveURL">