diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 55da1079e2..37db11af4e 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -1789,7 +1789,7 @@ private:
         gPeepSpawns.clear();
         for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
         {
-            if (_s4.peep_spawn[i].x != (uint16_t)LOCATION_NULL)
+            if (_s4.peep_spawn[i].x != PEEP_SPAWN_UNDEFINED)
             {
                 PeepSpawn spawn = { _s4.peep_spawn[i].x, _s4.peep_spawn[i].y, _s4.peep_spawn[i].z * 16,
                                     _s4.peep_spawn[i].direction };
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index bf7c72740b..04256b24e5 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -438,7 +438,7 @@ void S6Exporter::ExportPeepSpawns()
         }
         else
         {
-            _s6.peep_spawns[i] = { (uint16_t)LOCATION_NULL, (uint16_t)LOCATION_NULL, 0, 0 };
+            _s6.peep_spawns[i] = { PEEP_SPAWN_UNDEFINED, PEEP_SPAWN_UNDEFINED, 0, 0 };
         }
     }
 }
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 64b571e138..82b7dd8acf 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -836,7 +836,7 @@ public:
         gPeepSpawns.clear();
         for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
         {
-            if (_s6.peep_spawns[i].x != (uint16_t)LOCATION_NULL)
+            if (_s6.peep_spawns[i].x != PEEP_SPAWN_UNDEFINED)
             {
                 PeepSpawn spawn = { _s6.peep_spawns[i].x, _s6.peep_spawns[i].y, _s6.peep_spawns[i].z * 16,
                                     _s6.peep_spawns[i].direction };