diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py
index 204f0f8..139fcff 100644
--- a/src/agenda_culturel/calendar.py
+++ b/src/agenda_culturel/calendar.py
@@ -284,9 +284,9 @@ class CalendarList:
 
         for e in self.events:
             for e_rec in e.get_recurrences_between(firstdate, lastdate):
-                for d in daterange(e_rec.start_day, e_rec.end_day):
-                    if d.__str__() in self.calendar_days:
-                        self.calendar_days[d.__str__()].add_event(e_rec)
+                end = e_rec.start_day if e_rec.end_day is None else e_rec.end_day
+                for d in daterange(max(e_rec.start_day, self.firstdate), min(end, self.lastdate)):
+                    self.calendar_days[d.__str__()].add_event(e_rec)
 
     def create_calendar_days(self):
         # create daylist