diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
index ff4f7604be..315dae62f0 100644
--- a/src/openrct2/world/Map.cpp
+++ b/src/openrct2/world/Map.cpp
@@ -1335,6 +1335,9 @@ void MapUpdateTiles()
             for (int32_t blockX = 0; blockX < gMapSize.x; blockX += 256)
             {
                 auto mapPos = TileCoordsXY{ blockX + x, blockY + y }.ToCoordsXY();
+                if (MapIsEdge(mapPos))
+                    continue;
+
                 auto* surfaceElement = MapGetSurfaceElementAt(mapPos);
                 if (surfaceElement != nullptr)
                 {