diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 9e9955a2185..2a5dccfd499 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -42,6 +42,10 @@ public class ImageUtil {
             String edition = key.substring(index + 1);
             if (script.startsWith("emblem"))
                 return null;
+            if (null == StaticData.instance().getCardEdition(edition)) {
+                script = key;
+                edition = "???";
+            }
             script = script.replaceAll("[0-9]*$", "");
             return StaticData.instance().getAllTokens().getToken(script, edition);
         }