diff --git a/Mage.Sets/src/mage/cards/w/WallOfResistance.java b/Mage.Sets/src/mage/cards/w/WallOfResistance.java
index 06099d7b1d9..d03e519d713 100644
--- a/Mage.Sets/src/mage/cards/w/WallOfResistance.java
+++ b/Mage.Sets/src/mage/cards/w/WallOfResistance.java
@@ -1,9 +1,9 @@
 package mage.cards.w;
 
 import mage.MageInt;
+import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
 import mage.abilities.condition.Condition;
-import mage.abilities.condition.common.SourceDealtDamageCondition;
 import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.DefenderAbility;
@@ -14,7 +14,8 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.counters.CounterType;
-import mage.watchers.common.DamageDoneWatcher;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 
 import java.util.UUID;
 
@@ -23,8 +24,6 @@ import java.util.UUID;
  */
 public final class WallOfResistance extends CardImpl {
 
-    private static final Condition condition = new SourceDealtDamageCondition(1);
-
     public WallOfResistance(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
 
@@ -43,9 +42,9 @@ public final class WallOfResistance extends CardImpl {
                 new BeginningOfEndStepTriggeredAbility(
                         new AddCountersSourceEffect(CounterType.P0P1.createInstance()),
                         TargetController.ANY, false
-                ), condition, "At the beginning of each end step, " +
+                ), WallOfResistanceCondition.instance, "At the beginning of each end step, " +
                 "if {this} was dealt damage this turn, put a +0/+1 counter on it."
-        ), new DamageDoneWatcher());
+        ));
     }
 
     private WallOfResistance(final WallOfResistance card) {
@@ -57,3 +56,13 @@ public final class WallOfResistance extends CardImpl {
         return new WallOfResistance(this);
     }
 }
+
+enum WallOfResistanceCondition implements Condition {
+    instance;
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = source.getSourcePermanentOrLKI(game);
+        return permanent != null && !permanent.getDealtDamageByThisTurn().isEmpty();
+    }
+}