diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs
index da1a0d8b02..ed09029b0c 100644
--- a/OpenRA.Mods.RA/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA
 				}
 				if( inner != null )
 				{
-					if( currentTarget.GetDamageState() == DamageState.Undamaged )
+					if( NeedsNewTarget(self) )
 						inner.Cancel( self );
 					inner = Util.RunActivity( self, inner );
 				}