diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index 006486678c..53be597178 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -52,7 +52,8 @@ namespace OpenRA.Graphics
 		{
 			var r = (world.LocalPlayer != null && !world.LocalPlayer.Shroud.Disabled && world.LocalPlayer.Shroud.Bounds.HasValue)?
 				world.LocalPlayer.Shroud.Bounds.Value : world.Map.Bounds;
-						
+			r.Intersect(world.Map.Bounds);
+			
 			var left = (int)(Game.CellSize * r.Left - Game.viewport.Location.X);
 			var top = (int)(Game.CellSize * r.Top - Game.viewport.Location.Y);
 			var right = left + (int)(Game.CellSize * r.Width);