diff --git a/changelog.md b/changelog.md
index bd238c2a..c6058849 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@
 ## Fixes:
 * **[Mission Generator]** Fix mission generation error when there are too many radio frequency to setup for the Mig-21
 * **[Mission Generator]** Fix ground units not moving forward
+* **[Flight Planner]** Fix creation of custom waypoints.
 
 # 2.3.1
 
diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
index 3795bf1e..92145a1c 100644
--- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
+++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
@@ -116,7 +116,8 @@ class QFlightWaypointTab(QFrame):
         if not waypoints:
             return
         self.degrade_to_custom_flight_plan()
-        self.flight.flight_plan.waypoints.extend(waypoints)
+        assert isinstance(self.flight.flight_plan, CustomFlightPlan)
+        self.flight.flight_plan.custom_waypoints.extend(waypoints)
         self.flight_waypoint_list.update_list()
         self.on_change()
 
@@ -124,7 +125,8 @@ class QFlightWaypointTab(QFrame):
         rtb = self.planner.generate_rtb_waypoint(self.flight,
                                                  self.flight.from_cp)
         self.degrade_to_custom_flight_plan()
-        self.flight.flight_plan.waypoints.append(rtb)
+        assert isinstance(self.flight.flight_plan, CustomFlightPlan)
+        self.flight.flight_plan.custom_waypoints.append(rtb)
         self.flight_waypoint_list.update_list()
         self.on_change()