diff --git a/OpenRA.Mods.Common/Traits/EntersTunnels.cs b/OpenRA.Mods.Common/Traits/EntersTunnels.cs
index 281464d6b1..c07ad75b6f 100644
--- a/OpenRA.Mods.Common/Traits/EntersTunnels.cs
+++ b/OpenRA.Mods.Common/Traits/EntersTunnels.cs
@@ -62,15 +62,11 @@ namespace OpenRA.Mods.Common.Traits
 
 		public void ResolveOrder(Actor self, Order order)
 		{
-			if (order.OrderString != "EnterTunnel")
+			if (order.OrderString != "EnterTunnel" || order.Target.Type != TargetType.Actor)
 				return;
 
-			var target = self.ResolveFrozenActorOrder(order, Color.Red);
-			if (target.Type != TargetType.Actor)
-				return;
-
-			var tunnel = target.Actor.TraitOrDefault<TunnelEntrance>();
-			if (!tunnel.Exit.HasValue)
+			var tunnel = order.Target.Actor.TraitOrDefault<TunnelEntrance>();
+			if (tunnel == null || !tunnel.Exit.HasValue)
 				return;
 
 			if (!order.Queued)