diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs
index d47d3fd163..3e9bc10637 100644
--- a/OpenRA.Game/Graphics/Viewport.cs
+++ b/OpenRA.Game/Graphics/Viewport.cs
@@ -204,6 +204,7 @@ namespace OpenRA.Graphics
 		{
 			var localPlayer = Game.world.LocalPlayer;
 			if (localPlayer == null) return null;
+			if (localPlayer.Shroud.Disabled) return null;
 			return localPlayer.Shroud.Bounds;
 		}
 	}
diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs
index e6e92bcc28..642204528d 100644
--- a/OpenRA.Game/Traits/World/ResourceLayer.cs
+++ b/OpenRA.Game/Traits/World/ResourceLayer.cs
@@ -56,8 +56,7 @@ namespace OpenRA.Traits
 				for (int y = miny; y < maxy; y++)
 				{
 					if (world.LocalPlayer != null &&
-				    		!world.LocalPlayer.Shroud.IsExplored(new int2(x, y)) &&
-				    		!world.LocalPlayer.Shroud.Disabled)
+				    		!world.LocalPlayer.Shroud.IsExplored(new int2(x, y)))
 							continue;
 
 					var c = content[x, y];