diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
index 9e29b6a8682..6797a9b0581 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
@@ -392,7 +392,9 @@ public final class AbilityFactoryCopy {
 
                 AllZone.getTriggerHandler().suppressMode(TriggerType.Transformed);
                 boolean wasInAlt = false;
+                CardCharactersticName stateName = CardCharactersticName.Original;
                 if (c.isInAlternateState()) {
+                    stateName = c.getCurState();
                     wasInAlt = true;
                     c.setState(CardCharactersticName.Original);
                 }
@@ -464,10 +466,13 @@ public final class AbilityFactoryCopy {
                     copy.setCloneOrigin(hostCard);
                     sa.getSourceCard().addClone(copy);
                     crds[i] = copy;
-
-                    AllZone.getTriggerHandler().clearSuppression(TriggerType.Transformed);
                 }
 
+                if (wasInAlt) {
+                    c.setState(stateName);
+                }
+                AllZone.getTriggerHandler().clearSuppression(TriggerType.Transformed);
+
                 // have to do this since getTargetCard() might change
                 // if Kiki-Jiki somehow gets untapped again
                 final Card[] target = new Card[multiplier];