diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index de9f17e3..9628a6ed 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -304,6 +304,10 @@ function onPlayerAction(player, action, targets)
   end
 end
 
+function onObjectPickUp(_, object)
+  stopTokenTransformUpdating(object)
+end
+
 ---------------------------------------------------------
 -- chaos token drawing
 ---------------------------------------------------------
@@ -2913,7 +2917,9 @@ function stopTokenTransformUpdating(card)
     end
   end
   cardTokens[card] = nil
-  card.use_hands = true
+  if card ~= nil then
+    card.use_hands = true
+  end
 end
 
 -- removes tokens from the provided card/deck