diff --git a/OpenRA.Game/Graphics/Minimap.cs b/OpenRA.Game/Graphics/Minimap.cs
index afe5aac491..b092b3c1b5 100644
--- a/OpenRA.Game/Graphics/Minimap.cs
+++ b/OpenRA.Game/Graphics/Minimap.cs
@@ -44,8 +44,10 @@ namespace OpenRA.Graphics
 					{
 						var mapX = x + b.Left;
 						var mapY = y + b.Top;
-						var type = tileset[tileset.GetTerrainIndex(mapTiles[new MPos(mapX, mapY)])];
-						colors[y * stride + x] = type.Color.ToArgb();
+						var type = tileset.GetTileInfo(mapTiles[new MPos(mapX, mapY)]);
+						var color = type != null ? type.LeftColor : Color.Black;
+
+						colors[y * stride + x] = color.ToArgb();
 					}
 				}
 			}