diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index f03308509b..a7f5788c4a 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -62,6 +62,12 @@ struct PersistentStorageArray : BaseStorageArray {
 		free(this->prev_storage);
 	}
 
+	/** Resets all values to zero. */
+	void ResetToZero()
+	{
+		memset(this->storage, 0, sizeof(this->storage));
+	}
+
 	/**
 	 * Stores some value at a given position.
 	 * If there is no backup of the data that backup is made and then
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 7546edd46e..696c0a8c22 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2191,6 +2191,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		st->airport.layout = layout;
 		st->airport.flags = 0;
 		st->airport.rotation = rotation;
+		st->airport.psa.ResetToZero();
 
 		st->rect.BeforeAddRect(tile, w, h, StationRect::ADD_TRY);
 
@@ -2287,6 +2288,7 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
 
 		st->airport.Clear();
 		st->facilities &= ~FACIL_AIRPORT;
+		st->airport.psa.ResetToZero();
 
 		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, SVW_PLANES);