diff --git a/changelog.md b/changelog.md
index 9bd0a301..d85f0b7e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -27,6 +27,7 @@ Saves from 4.0.0 are compatible with 4.1.0.
 * **[Economy]** EWRs can now be bought and sold for the correct price and can no longer be used to generate money
 * **[Flight Planning]** Fixed potential issue with angles > 360° or < 0° being generated when summing two angles.
 * **[Mission Generation]** The lua data for other plugins is now generated correctly
+* **[Mission Generation]** The legacy always-available tanker option no longer prevents mission creation.
 * **[UI]** Statistics window tick marks are now always integers.
 
 # 4.0.0
diff --git a/gen/airsupportgen.py b/gen/airsupportgen.py
index 875a0e58..7ed159e2 100644
--- a/gen/airsupportgen.py
+++ b/gen/airsupportgen.py
@@ -127,7 +127,7 @@ class AirSupportConflictGenerator:
                         self.mission.country(self.game.player_country), tanker_unit_type
                     ),
                     airport=None,
-                    plane_type=tanker_unit_type,
+                    plane_type=tanker_unit_type.dcs_unit_type,
                     position=tanker_position,
                     altitude=alt,
                     race_distance=58000,
@@ -177,6 +177,8 @@ class AirSupportConflictGenerator:
                         tanker_unit_type.name,
                         freq,
                         tacan,
+                        start_time=None,
+                        end_time=None,
                         blue=True,
                     )
                 )