diff --git a/changelog.md b/changelog.md
index e4f9e743..2279041b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -28,6 +28,7 @@
 * **[Modding]** Added support for SK-60 mod (v1.2.1)
 * **[Mission Generation]** Introducing the Armed Recon flight plan, i.e. CAS against any Theater Ground Object
 * **[Doctrine]** Ability to customize the startup time allocated to the player
+* **[Mission Generation]** Ability to choose whether player flights can spawn on the sixpack or not
 
 ## Fixes
 * **[UI/UX]** A-10A flights can be edited again
diff --git a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
index 918545e1..5a5cb974 100644
--- a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
+++ b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
@@ -205,7 +205,10 @@ class WaypointGenerator:
             not self.flight.state.in_flight
             and self.flight.state.spawn_type is not StartType.RUNWAY
             and self.flight.departure.is_fleet
-            and not self.flight.client_count
+            and not (
+                self.flight.client_count
+                and self.flight.coalition.game.settings.player_flights_sixpack
+            )
         ):
             # https://github.com/dcs-liberation/dcs_liberation/issues/1309
             # Without a delay, AI aircraft will be spawned on the sixpack, which other
diff --git a/game/settings/settings.py b/game/settings/settings.py
index 25a03de3..cde47f32 100644
--- a/game/settings/settings.py
+++ b/game/settings/settings.py
@@ -939,6 +939,12 @@ class Settings:
         default=True,
         detail=("Enables dynamic cargo for airfields, ships, FARPs & warehouses."),
     )
+    player_flights_sixpack: bool = boolean_option(
+        "Player flights can spawn on the sixpack",
+        MISSION_GENERATOR_PAGE,
+        GAMEPLAY_SECTION,
+        default=True,
+    )
 
     # Performance
     perf_smoke_gen: bool = boolean_option(