diff --git a/Source/Plugins/Tilemaps/Core/Tilemaps/Tile.cs b/Source/Plugins/Tilemaps/Core/Tilemaps/Tile.cs
index 20073212e..7dc049dc0 100644
--- a/Source/Plugins/Tilemaps/Core/Tilemaps/Tile.cs
+++ b/Source/Plugins/Tilemaps/Core/Tilemaps/Tile.cs
@@ -273,6 +273,10 @@ public static void UpdateAutoTileCon(Grid<Tile> tileGrid, Grid<bool> updateMask,
 					int tileY = y + beginY;
 					int i = tileX + tileStride * tileY;
 
+					//Skip out of bounds tiles
+					if(i >= tiles.Length) continue;
+					if(tiles[i].BaseIndex >= tileData.Length) continue;
+
 					// Skip non-AutoTiles
 					int autoTileIndex = tileData[tiles[i].BaseIndex].AutoTileLayer - 1;
 					if (autoTileIndex == -1) continue;