diff --git a/src/main/java/forge/game/ai/ComputerUtilCombat.java b/src/main/java/forge/game/ai/ComputerUtilCombat.java
index 557f8102d9c..f9ac54c0223 100644
--- a/src/main/java/forge/game/ai/ComputerUtilCombat.java
+++ b/src/main/java/forge/game/ai/ComputerUtilCombat.java
@@ -1648,13 +1648,13 @@ public class ComputerUtilCombat {
     public static Map<Card, Integer> distributeAIDamage(final Card attacker, final List<Card> block, int dmgCanDeal, GameEntity defender) {
         Map<Card, Integer> damageMap = new HashMap<Card, Integer>();
         
-        if (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
-                || attacker.hasKeyword("CARDNAME assigns its combat damage as though it weren't blocked.")) {
+        boolean isAttacking = defender != null;
+        
+        if (isAttacking && (attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
+                || attacker.hasKeyword("CARDNAME assigns its combat damage as though it weren't blocked."))) {
             damageMap.put(null, dmgCanDeal);
             return damageMap;
         }
-    
-        boolean isAttacking = defender != null; 
         
         final boolean hasTrample = attacker.hasKeyword("Trample");