diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 49458d9f359..a7fb0555bf6 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -453,6 +453,9 @@ public class CardProperty {
             }
         } else if (property.startsWith("CanEnchant")) {
             final String restriction = property.substring(10);
+            if (restriction.equals("EquippedBy")) {
+                if (!source.getEquipping().canBeAttached(card)) return false;
+            }
             if (restriction.equals("Remembered")) {
                 for (final Object rem : source.getRemembered()) {
                     if (!(rem instanceof Card) || !((Card) rem).canBeAttached(card))