diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/WorldTooltipLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/WorldTooltipLogic.cs
index 64c1b1a0f5..7996c8b8aa 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/WorldTooltipLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/WorldTooltipLogic.cs
@@ -41,7 +41,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 
 			tooltipContainer.BeforeRender = () => 
 			{
-				if (wic == null || wic.ActorTooltip == null) return;
+				if (wic == null || wic.TooltipType == Type.None)
+					return;
 
 				labelText = wic.TooltipType == Type.Unexplored ? "Unexplored Terrain" :
 					wic.ActorTooltip.Name();