diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 873392468b8..885646b5b37 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -431,6 +431,7 @@ public class PhaseHandler implements java.io.Serializable {
                     }
 
                     nUpkeepsThisTurn = 0;
+                    nCombatsThisTurn = 0;
                     nMain2sThisTurn = 0;
                     game.getStack().resetMaxDistinctSources();
 
@@ -479,10 +480,6 @@ public class PhaseHandler implements java.io.Serializable {
         }
 
         switch (phase) {
-            case UNTAP:
-                nCombatsThisTurn = 0;
-                break;
-
             case UPKEEP:
                 for (Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) {
                     c.getDamageHistory().setNotAttackedSinceLastUpkeepOf(playerTurn);
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
index 6e40b52e377..25a41f579c4 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -330,7 +330,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
         }
 
         if (this.getFirstCombatOnly()) {
-            if (game.getPhaseHandler().getNumCombat() > 1) {
+            if (game.getPhaseHandler().getNumCombat() > (game.getPhaseHandler().inCombat() ? 1 : 0)) {
                 return false;
             }
         }