diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index 99d596e5..efa14115 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -2877,12 +2877,14 @@ function moveCardWithTokens(params)
   Wait.condition(
     function() stopTokenTransformUpdating(card) end,
     function()
+      if card.held_by_color ~= nil then return true end
+
       if card ~= nil and cardTokens[card] ~= nil and #cardTokens[card] ~= 0 then
         updateTokenTransform(card)
         return card.resting and not card.isSmoothMoving()
-      else
-        return true
       end
+
+      return true
     end
   )
 end