diff --git a/OpenRA.Game/Graphics/TerrainSpriteLayer.cs b/OpenRA.Game/Graphics/TerrainSpriteLayer.cs
index 7acf569aaf..67c254c691 100644
--- a/OpenRA.Game/Graphics/TerrainSpriteLayer.cs
+++ b/OpenRA.Game/Graphics/TerrainSpriteLayer.cs
@@ -87,6 +87,10 @@ namespace OpenRA.Graphics
 			else
 				sprite = emptySprite;
 
+			// The vertex buffer does not have geometry for cells outside the map
+			if (!map.Contains(uv))
+				return;
+
 			var offset = rowStride * uv.V + 6 * uv.U;
 			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);