diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index e7a678ae43d..2d4f03958c5 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -634,7 +634,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
         }
 
-        if(source.isCommander())
+        if(source.isCommander() && isCombat)
         {
             if(!commanderDamage.containsKey(source))
             {