diff --git a/program/services.py b/program/services.py
index 994a2e94acfaf67c562e9fe28c85c10718dcf564..0ec3c79f203bd86fcf49cc2befd5547b96e5af78 100644
--- a/program/services.py
+++ b/program/services.py
@@ -535,7 +535,7 @@ def generate_timeslots(schedule: Schedule) -> list[TimeSlot]:
                 starts[k] = starts[k] + relativedelta(days=+schedule.add_days_no)
                 ends[k] = ends[k] + relativedelta(days=+schedule.add_days_no)
 
-            if ends[k].date() > schedule.last_date:
+            if schedule.last_date and ends[k].date() > schedule.last_date:
                 schedule.last_date = ends[k].date()
         timeslots.append(
             TimeSlot(