diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e2421f3068..fc4ce1ee04 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -828,7 +828,6 @@ static void DeleteStationIfEmpty(BaseStation *st)
 void Station::AfterStationTileSetChange(bool adding, StationType type)
 {
 	this->UpdateVirtCoord();
-	this->RecomputeCatchment();
 	DirtyCompanyInfrastructureWindows(this->owner);
 	if (adding) InvalidateWindowData(WC_STATION_LIST, this->owner, 0);
 
@@ -849,10 +848,12 @@ void Station::AfterStationTileSetChange(bool adding, StationType type)
 	}
 
 	if (adding) {
+		this->RecomputeCatchment();
 		UpdateStationAcceptance(this, false);
 		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
 	} else {
 		DeleteStationIfEmpty(this);
+		this->RecomputeCatchment();
 	}
 
 }