diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp
index a3e171d336..4c14e25c99 100644
--- a/src/openrct2/GameState.cpp
+++ b/src/openrct2/GameState.cpp
@@ -88,7 +88,7 @@ void GameState::InitAll(const TileCoordsXY& mapSize)
 
     gInMapInitCode = false;
 
-    gNextGuestNumber = 1;
+    GetGameState().NextGuestNumber = 1;
 
     ContextInit();
     ScenerySetDefaultPlacementConfiguration();
diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h
index abe661892d..4b3e03bb55 100644
--- a/src/openrct2/GameState.h
+++ b/src/openrct2/GameState.h
@@ -41,6 +41,7 @@ namespace OpenRCT2
         uint8_t GuestInitialHappiness;
         uint8_t GuestInitialHunger;
         uint8_t GuestInitialThirst;
+        uint32_t NextGuestNumber;
         money64 WeeklyProfitAverageDividend;
         uint16_t WeeklyProfitAverageDivisor;
         money64 WeeklyProfitHistory[FINANCE_GRAPH_SIZE];
diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index e517e54188..7f02c606a4 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -7179,7 +7179,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
     peep->TimeToConsume = 0;
 
     peep->GuestNumRides = 0;
-    peep->PeepId = gNextGuestNumber++;
+    peep->PeepId = gameState.NextGuestNumber++;
     peep->Name = nullptr;
 
     money64 cash = (static_cast<money64>(ScenarioRand() & 0x3) * 100) - 100 + gameState.GuestInitialCash;
diff --git a/src/openrct2/entity/Guest.h b/src/openrct2/entity/Guest.h
index 50bfea51cd..7c92c54976 100644
--- a/src/openrct2/entity/Guest.h
+++ b/src/openrct2/entity/Guest.h
@@ -465,8 +465,6 @@ extern uint32_t gNumGuestsInPark;
 extern uint32_t gNumGuestsInParkLastWeek;
 extern uint32_t gNumGuestsHeadingForPark;
 
-extern uint32_t gNextGuestNumber;
-
 void PeepThoughtSetFormatArgs(const PeepThought* thought, Formatter& ft);
 
 void IncrementGuestsInPark();
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index d1ee319857..25f4359c85 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -71,8 +71,6 @@ uint32_t gNumGuestsInPark;
 uint32_t gNumGuestsInParkLastWeek;
 uint32_t gNumGuestsHeadingForPark;
 
-uint32_t gNextGuestNumber;
-
 uint8_t gPeepWarningThrottle[16];
 
 std::unique_ptr<GuestPathfinding> gGuestPathfinder = std::make_unique<OriginalPathfinding>();
diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
index 8c54b9fa2d..7d45a23e14 100644
--- a/src/openrct2/park/ParkFile.cpp
+++ b/src/openrct2/park/ParkFile.cpp
@@ -527,7 +527,7 @@ namespace OpenRCT2
                 cs.ReadWrite(gameState.GuestInitialHunger);
                 cs.ReadWrite(gameState.GuestInitialThirst);
 
-                cs.ReadWrite(gNextGuestNumber);
+                cs.ReadWrite(gameState.NextGuestNumber);
                 cs.ReadWriteVector(gPeepSpawns, [&cs](PeepSpawn& spawn) {
                     cs.ReadWrite(spawn.x);
                     cs.ReadWrite(spawn.y);
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index fbcc3db637..bda8fdd5fb 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -446,7 +446,7 @@ namespace RCT2
 
             ImportRideRatingsCalcData();
             ImportRideMeasurements();
-            gNextGuestNumber = _s6.NextGuestIndex;
+            gameState.NextGuestNumber = _s6.NextGuestIndex;
             gGrassSceneryTileLoopPosition = _s6.GrassAndSceneryTilepos;
             // unk_13CA73E
             // Pad13CA73F