diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
index 3ccf0b44c41..50f845326d2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
@@ -88,14 +88,11 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                 List<Card> attackers = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() {
                     @Override
                     public boolean apply(final Card c) {
-                        if (combat == null) {
-                            return false;
-                        }
                         if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost() 
-                                && !combat.isAttacking(c)) {
+                                && (combat == null || !combat.isAttacking(c))) {
                             return false;
                         }
-                        return (c.isCreature() && CombatUtil.canAttack(c, human) || combat.isAttacking(c));
+                        return (c.isCreature() && CombatUtil.canAttack(c, human) || (combat != null && combat.isAttacking(c)));
                     }
                 });
                 if (!CombatUtil.canBlockAtLeastOne(card, attackers)) {
@@ -112,7 +109,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                 @Override
                 public boolean apply(final Card c) {
                     if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost() 
-                            && (combat != null && !combat.isAttacking(c))) {
+                            && (combat == null || !combat.isAttacking(c))) {
                         return false;
                     }
                     return (c.isCreature() && CombatUtil.canAttack(c, human) || (combat != null && combat.isAttacking(c)));