diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 9fda946fcf..24134b400f 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2638,9 +2638,9 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
 
 	if (flags & DC_EXEC) {
 		for (uint i = 0; i < st->airport.GetNumHangars(); ++i) {
-			DeleteWindowById(
-				WC_VEHICLE_DEPOT, st->airport.GetHangarTile(i)
-			);
+			TileIndex tile_cur = st->airport.GetHangarTile(i);
+			OrderBackup::Reset(tile_cur, false);
+			DeleteWindowById(WC_VEHICLE_DEPOT, tile_cur);
 		}
 
 		ZoningMarkDirtyStationCoverageArea(st);
@@ -2654,7 +2654,6 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
 		nearest->noise_reached -= GetAirportNoiseLevelForDistance(as, dist);
 
 		TILE_AREA_LOOP(tile_cur, st->airport) {
-			if (IsHangarTile(tile_cur)) OrderBackup::Reset(tile_cur, false);
 			DeleteAnimatedTile(tile_cur);
 			DoClearSquare(tile_cur);
 			DeleteNewGRFInspectWindow(GSF_AIRPORTTILES, tile_cur);