diff --git a/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java b/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
index 02d35a5df16..9c2517ebc06 100644
--- a/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
+++ b/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
@@ -82,7 +82,9 @@ class CombatCalligrapherTriggeredAbility extends TriggeredAbilityImpl {
     public boolean checkTrigger(GameEvent event, Game game) {
         Player attacker = game.getPlayer(event.getPlayerId());
         Player defender = game.getPlayer(event.getTargetId());
-        if (!game.getOpponents(getControllerId()).contains(attacker.getId())
+        // Do not trigger if opponent is out of range (not visible as opponent to controller, and not the controller)
+        // or if the person being attacked is not an opponent of the controller.
+        if ((!game.getOpponents(getControllerId()).contains(attacker.getId()) && attacker.getId() != getControllerId())
                 || !game.getOpponents(getControllerId()).contains(defender.getId())) {
             return false;
         }