diff --git a/OpenRA.Mods.Common/Traits/Tooltip.cs b/OpenRA.Mods.Common/Traits/Tooltip.cs
index d2f7040702..4de6597029 100644
--- a/OpenRA.Mods.Common/Traits/Tooltip.cs
+++ b/OpenRA.Mods.Common/Traits/Tooltip.cs
@@ -77,7 +77,14 @@ namespace OpenRA.Mods.Common.Traits
 		readonly TooltipInfo info;
 
 		public ITooltipInfo TooltipInfo { get { return info; } }
-		public Player Owner { get { return self.Owner; } }
+
+		public Player Owner
+		{
+			get
+			{
+				return self.EffectiveOwner != null ? self.EffectiveOwner.Owner : self.Owner;
+			}
+		}
 
 		public Tooltip(Actor self, TooltipInfo info)
 			: base(info)