diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
index d13c067608c..cd6ee096fc6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouEffect.java
@@ -35,6 +35,11 @@ public class CantAttackYouEffect extends RestrictionEffect {
         if (defenderId == null) {
             return true;
         }
+        // A planeswalker controlled by the controller is the defender
+        if (game.getPermanent(defenderId) != null) {
+            return !game.getPermanent(defenderId).getControllerId().equals(source.getControllerId());
+        }
+        // The controller is the defender
         return !defenderId.equals(source.getControllerId());
     }
 }