diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index e09cadb5231..7c9ea98edcf 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -5852,6 +5852,9 @@ public class Card extends GameEntity implements Comparable<Card> {
             damageToAdd = replaceDamage(damageToAdd, source, true);
             damageToAdd = preventDamage(damageToAdd, source, true);
 
+            if (damageToAdd > 0) {
+                getDamageHistory().registerCombatDamage(source);
+            }
             map.put(source, damageToAdd);
         }
 
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index 0305f69ccee..1c39fef592b 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -780,20 +780,7 @@ public class Combat {
                 continue;
             }
 
-            final Map<Card, Integer> assignedDamageMap = c.getAssignedDamageMap();
-            final Map<Card, Integer> damageMap = Maps.newHashMap();
-
-            for (final Entry<Card, Integer> entry : assignedDamageMap.entrySet()) {
-                final Card crd = entry.getKey();
-                c.getDamageHistory().registerCombatDamage(crd);
-                damageMap.put(crd, entry.getValue());
-                if (entry.getValue() > 0) {
-                    this.addDealtDamageTo(crd, c, entry.getValue());
-                }
-            }
-            c.addCombatDamage(damageMap);
-
-            damageMap.clear();
+            c.addCombatDamage(c.getAssignedDamageMap());
             c.clearAssignedDamage();
         }