diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 2a5dccfd499..958e2cf5036 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -15,7 +15,7 @@ public class ImageUtil {
     }
 
     public static PaperCard getPaperCardFromImageKey(String key) {
-        if ( key == null ) {
+        if (key == null) {
             return null;
         }
 
diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index 581b3578b12..d476a2eb336 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -156,7 +156,7 @@ public class ImageCache {
 
         IPaperCard ipc = null;
         boolean altState = imageKey.endsWith(ImageKeys.BACKFACE_POSTFIX);
-        if(altState)
+        if (altState)
             imageKey = imageKey.substring(0, imageKey.length() - ImageKeys.BACKFACE_POSTFIX.length());
         if (imageKey.startsWith(ImageKeys.CARD_PREFIX)) {
             PaperCard pc = ImageUtil.getPaperCardFromImageKey(imageKey);
@@ -165,7 +165,7 @@ public class ImageCache {
             if (StringUtils.isBlank(imageKey)) {
                 return _defaultImage;
             }
-        } else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX)) {
+        } else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX) && cardView.isToken()) {
             ipc = ImageUtil.getPaperTokenFromImageKey(imageKey);
         }