diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index 3029c1144b..7a9cc2caac 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -42,7 +42,7 @@ struct Vehicle;
 #define DOWNTIME_HISTORY_SIZE 8
 #define CUSTOMER_HISTORY_SIZE 10
 #define MAX_CARS_PER_TRAIN 255
-#define MAX_STATIONS 4
+#define MAX_STATIONS 8 // Increase to 254 once the tile elements can handle it
 #define MAX_RIDES 255
 #define RIDE_TYPE_NULL 255
 #define RIDE_ADJACENCY_CHECK_DISTANCE 5
diff --git a/src/openrct2/world/Entity.h b/src/openrct2/world/Entity.h
index 2259d47bcd..efc4eff72d 100644
--- a/src/openrct2/world/Entity.h
+++ b/src/openrct2/world/Entity.h
@@ -11,7 +11,7 @@
 
 #include "SpriteBase.h"
 
-constexpr uint16_t MAX_ENTITIES = 10000;
+constexpr uint16_t MAX_ENTITIES = 65535;
 
 SpriteBase* try_get_sprite(size_t spriteIndex);
 SpriteBase* get_sprite(size_t sprite_idx);