diff --git a/src/main/java/forge/ComputerUtilAttack.java b/src/main/java/forge/ComputerUtilAttack.java
index 206eef50cd0..9171229507a 100644
--- a/src/main/java/forge/ComputerUtilAttack.java
+++ b/src/main/java/forge/ComputerUtilAttack.java
@@ -783,7 +783,8 @@ public class ComputerUtilAttack {
         for (final Card defender : defenders) {
             if (CombatUtil.canBlock(attacker, defender)) { // , combat )) {
                 numberOfPossibleBlockers += 1;
-                if (CombatUtil.canDestroyAttacker(attacker, defender, combat, false)) {
+                if (CombatUtil.canDestroyAttacker(attacker, defender, combat, false)
+                        && !(attacker.hasKeyword("Undying") && attacker.getCounters(Counters.P1P1) == 0)) {
                     canBeKilledByOne = true; // there is a single creature on
                                              // the battlefield that can kill
                                              // the creature
diff --git a/src/main/java/forge/ComputerUtilBlock.java b/src/main/java/forge/ComputerUtilBlock.java
index 20e33f7c812..e5e3af90308 100644
--- a/src/main/java/forge/ComputerUtilBlock.java
+++ b/src/main/java/forge/ComputerUtilBlock.java
@@ -352,7 +352,8 @@ public class ComputerUtilBlock {
                     final Card worst = CardFactoryUtil.getWorstCreatureAI(killingBlockers);
 
                     if ((CardFactoryUtil.evaluateCreature(worst) + ComputerUtilBlock.getDiff()) < CardFactoryUtil
-                            .evaluateCreature(attacker)) {
+                            .evaluateCreature(attacker)
+                            || (worst.hasKeyword("Undying") && worst.getCounters(Counters.P1P1) == 0)) {
                         blocker = worst;
                     }
                 }