diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
index 6ad6ec7e0d6..4498a261b60 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
@@ -1154,6 +1154,7 @@ public class AbilityFactoryAttach {
             // If this Card is already Enchanting something
             // Need to unenchant it, then clear out the commands
             final GameEntity oldEnchanted = card.getEnchanting();
+            oldEnchanted.removeEnchantedBy(card);
             card.removeEnchanting(oldEnchanted);
             card.clearEnchantCommand();
             card.clearUnEnchantCommand();
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index d8e21fe9b6c..3a6eb4cc0c5 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -995,6 +995,7 @@ public final class AbilityFactoryChangeZone {
                                 // Need to unenchant it, then clear out the
                                 // commands
                                 final GameEntity oldEnchanted = c.getEnchanting();
+                                oldEnchanted.removeEnchantedBy(c);
                                 c.removeEnchanting(oldEnchanted);
                                 c.clearEnchantCommand();
                                 c.clearUnEnchantCommand();