diff --git a/CHANGELOG.md b/CHANGELOG.md
index 892788fd..b68b738e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update shift API to use a default interval value (`1`) when a `frequency` is set and no `interval` is given
 - Limit number of alertmanager alerts in alert group to autoresolve by 500 ([1779](https://github.com/grafana/oncall/pull/1779))
+- Update schedule and personal ical exports to use final shift events
 
 ## v1.2.14 (2023-04-19)
 
diff --git a/engine/apps/schedules/ical_utils.py b/engine/apps/schedules/ical_utils.py
index 9037a09b..4c9a3821 100644
--- a/engine/apps/schedules/ical_utils.py
+++ b/engine/apps/schedules/ical_utils.py
@@ -652,14 +652,8 @@ def _get_ical_data_final_schedule(schedule: OnCallSchedule) -> str:
 
 
 def ical_export_from_schedule(schedule: OnCallSchedule) -> bytes:
-    if _is_final_export_enabled(schedule):
-        ical_data = _get_ical_data_final_schedule(schedule)
-        return ical_data.encode()
-    else:
-        calendars = schedule.get_icalendars()
-        ical_obj = create_base_icalendar(schedule.name)
-        get_events_from_calendars(ical_obj, calendars)
-        return ical_obj.to_ical()
+    ical_data = _get_ical_data_final_schedule(schedule)
+    return ical_data.encode()
 
 
 def user_ical_export(user: User, schedules: list[OnCallSchedule]) -> bytes:
@@ -667,13 +661,9 @@ def user_ical_export(user: User, schedules: list[OnCallSchedule]) -> bytes:
     ical_obj = create_base_icalendar(schedule_name)
 
     for schedule in schedules:
-        if _is_final_export_enabled(schedule):
-            name = schedule.name
-            ical_data = _get_ical_data_final_schedule(schedule)
-            calendars = [Calendar.from_ical(ical_data)]
-        else:
-            name = None
-            calendars = schedule.get_icalendars()
+        name = schedule.name
+        ical_data = _get_ical_data_final_schedule(schedule)
+        calendars = [Calendar.from_ical(ical_data)]
         get_user_events_from_calendars(ical_obj, calendars, user, name=name)
 
     return ical_obj.to_ical()