diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py
index cef91550..f37948f9 100644
--- a/game/theater/start_generator.py
+++ b/game/theater/start_generator.py
@@ -346,6 +346,7 @@ class CarrierGroundObjectGenerator(GenericCarrierGroundObjectGenerator):
             [c for c in classes if c == UnitClass.AIRCRAFT_CARRIER]
         ):
             self.game.theater.controlpoints.remove(self.control_point)
+            sqdrns = self.control_point.squadrons
             self.control_point = EssexCarrier(
                 self.control_point.name,
                 self.control_point.position,
@@ -354,6 +355,9 @@ class CarrierGroundObjectGenerator(GenericCarrierGroundObjectGenerator):
             )
             self.control_point.finish_init(self.game)
             self.game.theater.controlpoints.append(self.control_point)
+            for sqdrn in sqdrns:
+                if sqdrn.aircraft.lha_capable:
+                    sqdrn.location = self.control_point
 
 
 class LhaGroundObjectGenerator(GenericCarrierGroundObjectGenerator):