diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 8753c8690b9..1af4f60d561 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -146,17 +146,16 @@ public class GameAction {
         Card copied = null;
         Card lastKnownInfo = null;
 
+        if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
+            c.setState(CardCharacteristicName.Original);
+        }
+
         // Don't copy Tokens, copy only cards leaving the battlefield
         if (c.isToken() || suppress || zoneTo.is(ZoneType.Battlefield) || zoneFrom == null
                 || !zoneFrom.is(ZoneType.Battlefield)) {
             lastKnownInfo = c;
             copied = c;
         } else {
-            if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
-                c.setState(CardCharacteristicName.Original);
-            }
-
-            
             lastKnownInfo = CardUtil.getLKICopy(c);
 
             if (c.isCloned()) {
@@ -366,11 +365,6 @@ public class GameAction {
        // FThreads.assertExecutedByEdt(false); // This code must never be executed from EDT, 
                                              // use FThreads.invokeInNewThread to run code in a pooled thread
 
-        // if a split card is moved, convert it back to its full form before moving (unless moving to stack)
-        if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
-            c.setState(CardCharacteristicName.Original);
-        }
-
         return moveTo(zoneTo, c, null);
     }