diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 3e4898725b..fe11cbff39 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -2021,7 +2021,7 @@ struct CompanyWindow : Window
 				break;
 
 			case WID_C_DESC_VEHICLE_COUNTS: {
-				uint64_t max_value = GetParamMaxValue(5000); // Maximum number of vehicles
+				uint64_t max_value = GetParamMaxValue(10000); // Maximum number of vehicles
 				for (const auto &count_string : _company_view_vehicle_count_strings) {
 					size.width = std::max(size.width, GetStringBoundingBox(GetString(count_string, max_value)).width + padding.width);
 				}
diff --git a/src/table/settings/game_settings.ini b/src/table/settings/game_settings.ini
index 827ebca127..40bc6181df 100644
--- a/src/table/settings/game_settings.ini
+++ b/src/table/settings/game_settings.ini
@@ -247,7 +247,7 @@ var      = vehicle.max_trains
 type     = VarTypes::U16
 def      = 500
 min      = 0
-max      = 5000
+max      = 10000
 str      = STR_CONFIG_SETTING_MAX_TRAINS
 strhelp  = STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT
 strval   = STR_JUST_COMMA
@@ -259,7 +259,7 @@ var      = vehicle.max_roadveh
 type     = VarTypes::U16
 def      = 500
 min      = 0
-max      = 5000
+max      = 10000
 str      = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES
 strhelp  = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT
 strval   = STR_JUST_COMMA
@@ -271,7 +271,7 @@ var      = vehicle.max_aircraft
 type     = VarTypes::U16
 def      = 200
 min      = 0
-max      = 5000
+max      = 10000
 str      = STR_CONFIG_SETTING_MAX_AIRCRAFT
 strhelp  = STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT
 strval   = STR_JUST_COMMA
@@ -283,7 +283,7 @@ var      = vehicle.max_ships
 type     = VarTypes::U16
 def      = 300
 min      = 0
-max      = 5000
+max      = 10000
 str      = STR_CONFIG_SETTING_MAX_SHIPS
 strhelp  = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
 strval   = STR_JUST_COMMA