diff --git a/ChangeLog b/ChangeLog
index 7e61ce8f0..051daa279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-07-20  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder
+	-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
+	avoid returning repeating events when no end date is
+	defined. Ultimately, we should return the first occurrence of
+	repeating events when no end date is defined and therefore, move
+	the logic into iCalRecurrenceCalculators.
+
 2009-07-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/SOGoUI/UIxComponent.m (-responseWithStatus:): revert the
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index a901a7b19..aa5f28ce2 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -997,7 +997,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   /* fetch recurrent apts now. we do NOT consider events with no cycle end. */
 //  || _endDate || filters)
-  if (canCycle)
+  if (canCycle && _endDate)
     {
       where = [NSString stringWithFormat: @"%@ AND c_iscycle = 1", baseWhere];
       qualifier = [EOQualifier qualifierWithQualifierFormat: [where substringFromIndex: 4]];