diff --git a/engine/apps/schedules/ical_events/adapter/amixr_recurring_ical_events_adapter.py b/engine/apps/schedules/ical_events/adapter/amixr_recurring_ical_events_adapter.py
index 155a6161..fa0dc3ff 100644
--- a/engine/apps/schedules/ical_events/adapter/amixr_recurring_ical_events_adapter.py
+++ b/engine/apps/schedules/ical_events/adapter/amixr_recurring_ical_events_adapter.py
@@ -20,6 +20,15 @@ EXTRA_LOOKUP_DAYS = 16
 
 
 class AmixrRecurringIcalEventsAdapter(IcalService):
+    def _normalize(self, dt: datetime.datetime) -> datetime.datetime:
+        tz = getattr(dt, "tzinfo", None)
+        if tz:
+            normalized = tz.normalize(dt)
+            if normalized.tzinfo != tz:
+                diff = dt.dst() - normalized.dst()
+                dt = normalized + diff
+        return dt
+
     def get_events_from_ical_between(
         self, calendar: Calendar, start_date: datetime.datetime, end_date: datetime.datetime
     ) -> typing.List[Event]:
@@ -38,6 +47,10 @@ class AmixrRecurringIcalEventsAdapter(IcalService):
             end_date + datetime.timedelta(days=EXTRA_LOOKUP_DAYS),
         )
 
+        for event in events:
+            # account for timezones not being properly calculated when DST changes.
+            event[ICAL_DATETIME_END].dt = self._normalize(event[ICAL_DATETIME_END].dt)
+
         def filter_extra_days(event):
             event_start, event_end = self.get_start_and_end_with_respect_to_event_type(event)
             if event_start > event_end:
diff --git a/engine/apps/schedules/tests/test_on_call_schedule.py b/engine/apps/schedules/tests/test_on_call_schedule.py
index e63c96b2..71a029b4 100644
--- a/engine/apps/schedules/tests/test_on_call_schedule.py
+++ b/engine/apps/schedules/tests/test_on_call_schedule.py
@@ -1818,6 +1818,63 @@ def test_refresh_ical_final_schedule_ok(
                 assert event in expected_events
 
 
+@pytest.mark.django_db
+def test_filter_events_during_dst_change(
+    make_organization,
+    make_user_for_organization,
+    make_schedule,
+    make_on_call_shift,
+):
+    organization = make_organization()
+    u1 = make_user_for_organization(organization)
+
+    schedule = make_schedule(
+        organization,
+        time_zone="America/Chicago",  # UTC-6 or UTC-5 depending on DST
+        schedule_class=OnCallScheduleCalendar,
+    )
+    start_datetime = timezone.datetime(2024, 10, 1, 0, 0, 0, tzinfo=timezone.utc)
+    duration = timezone.timedelta(seconds=60 * 60 * 24 * 7)  # 1 week
+    data = {
+        "start": start_datetime,
+        "rotation_start": start_datetime,
+        "duration": duration,
+        "frequency": CustomOnCallShift.FREQUENCY_WEEKLY,
+        "week_start": CustomOnCallShift.MONDAY,
+    }
+    on_call_shift = make_on_call_shift(
+        organization=organization, shift_type=CustomOnCallShift.TYPE_ROLLING_USERS_EVENT, **data
+    )
+    on_call_shift.add_rolling_users([[u1]])
+    schedule.custom_on_call_shifts.add(on_call_shift)
+
+    schedule.refresh_ical_file()
+
+    # week with DST change
+    start_date = timezone.datetime(2024, 11, 4, 0, 0, 0, tzinfo=timezone.utc)
+    end_date = start_date + timezone.timedelta(days=1)
+    events = schedule.filter_events(start_date, end_date)
+    expected = {
+        "start": timezone.datetime(2024, 10, 29, 5, 0, 0, tzinfo=timezone.utc),
+        "end": timezone.datetime(2024, 11, 5, 6, 0, 0, tzinfo=timezone.utc),
+    }
+    assert len(events) == 1
+    returned = {"start": events[0]["start"], "end": events[0]["end"]}
+    assert returned == expected
+
+    # week with DST change back
+    start_date = timezone.datetime(2025, 3, 10, 0, 0, 0, tzinfo=timezone.utc)
+    end_date = start_date + timezone.timedelta(days=1)
+    events = schedule.filter_events(start_date, end_date)
+    expected = {
+        "start": timezone.datetime(2025, 3, 4, 6, 0, 0, tzinfo=timezone.utc),
+        "end": timezone.datetime(2025, 3, 11, 5, 0, 0, tzinfo=timezone.utc),
+    }
+    assert len(events) == 1
+    returned = {"start": events[0]["start"], "end": events[0]["end"]}
+    assert returned == expected
+
+
 @pytest.mark.django_db
 def test_refresh_ical_final_schedule_cancel_deleted_events(
     make_organization,