diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua
index 6fc9e475..426cf79f 100644
--- a/src/playermat/Playmat.ttslua
+++ b/src/playermat/Playmat.ttslua
@@ -903,10 +903,7 @@ function maybeUpdateActiveInvestigator(card)
   end
 
   -- spawn additional token (maybe specific for investigator)
-  if extraToken ~= "None" then
-    -- set to current class if nil
-    extraToken = extraToken or activeInvestigatorClass
-
+  if extraToken and extraToken ~= "None" then
     -- local positions
     local tokenSpawnPos = {
       action = {