diff --git a/game/missiongenerator/aircraft/aircraftgenerator.py b/game/missiongenerator/aircraft/aircraftgenerator.py
index 6458393f..5389fb08 100644
--- a/game/missiongenerator/aircraft/aircraftgenerator.py
+++ b/game/missiongenerator/aircraft/aircraftgenerator.py
@@ -29,7 +29,6 @@ from game.settings import Settings
 from game.theater.controlpoint import (
     Airfield,
     ControlPoint,
-    Fob,
 )
 from game.unitmap import UnitMap
 from .aircraftpainter import AircraftPainter
@@ -231,13 +230,6 @@ class AircraftGenerator:
             ).configure()
         )
 
-        wpt = group.waypoint("LANDING")
-        if flight.is_helo and isinstance(flight.arrival, Fob) and wpt:
-            hpad = self.helipads[flight.arrival].pop(0)
-            wpt.helipad_id = hpad.units[0].id
-            wpt.link_unit = hpad.units[0].id
-            self.helipads[flight.arrival].append(hpad)
-
         if self.ewrj:
             self._track_ewrj_flight(flight, group)
 
diff --git a/game/missiongenerator/aircraft/flightgroupspawner.py b/game/missiongenerator/aircraft/flightgroupspawner.py
index fcd4dd84..73b09ac6 100644
--- a/game/missiongenerator/aircraft/flightgroupspawner.py
+++ b/game/missiongenerator/aircraft/flightgroupspawner.py
@@ -9,7 +9,7 @@ from dcs.mission import StartType as DcsStartType
 from dcs.planes import F_14A, Su_33
 from dcs.point import PointAction
 from dcs.ships import KUZNECOW
-from dcs.terrain import Airport, NoParkingSlotError
+from dcs.terrain import NoParkingSlotError
 from dcs.unitgroup import FlyingGroup, ShipGroup, StaticGroup
 
 from game.ato import Flight
@@ -310,6 +310,13 @@ class FlightGroupSpawner:
             group.points[0].action = PointAction.FromGroundAreaHot
             group.points[0].type = "TakeOffGroundHot"
 
+        wpt = group.waypoint("LANDING")
+        if wpt:
+            hpad = self.helipads[self.flight.arrival].pop(0)
+            wpt.helipad_id = hpad.units[0].id
+            wpt.link_unit = hpad.units[0].id
+            self.helipads[self.flight.arrival].append(hpad)
+
         for i in range(self.flight.count - 1):
             try:
                 helipad = self.helipads[cp].pop()