diff --git a/src/genworld.cpp b/src/genworld.cpp
index 925fd5c83da..e073ced06a0 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -147,6 +147,7 @@ static void _GenerateWorld()
 					HandleGeneratingWorldAbortion();
 					return;
 				}
+				UpdateTownCargoBitmap();
 				GenerateIndustries();
 				GenerateObjects();
 				GenerateTrees();
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 0849c5ca15e..87391dc3876 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -2074,6 +2074,8 @@ CommandCost CmdFoundTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 			/* 't' can't be nullptr since 'random' is false outside scenedit */
 			assert(!random);
 
+			UpdateTownCargoBitmap();
+
 			if (_current_company == OWNER_DEITY) {
 				SetDParam(0, t->index);
 				AddTileNewsItem(STR_NEWS_NEW_TOWN_UNSPONSORED, NT_INDUSTRY_OPEN, tile);