diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java
index 8a81a208d2..c57a41f043 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java
@@ -222,7 +222,7 @@ public class CardPanelComponentImpl extends CardPanel {
         }
 
         displayTitleAnyway = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_CARD_NAMES, "true").equals("true");
-        displayFullImagePath = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_FULL_IMAGE_PATH, "true").equals("true");
+        displayFullImagePath = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_FULL_IMAGE_PATH, "false").equals("true");
 
         // Title Text
         titleText = new GlowText();
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index 3f033bdaec..97cbd4af82 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -187,7 +187,7 @@ public final class ImageCache {
             String path;
             if (collectorId.isEmpty() || "0".equals(collectorId)) {
                 info.setToken(true);
-                path = CardImageUtils.generateTokenImagePath(info);
+                path = CardImageUtils.generateFullTokenImagePath(info);
                 if (path == null) {
                     path = DirectLinksForDownload.outDir + File.separator + DirectLinksForDownload.cardbackFilename;
                 }
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
index cba58f353f..ac45d2a2f8 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
@@ -48,6 +48,19 @@ public final class CardImageUtils {
         log.warn("Token image file not found: " + card.getSet() + " - " + card.getTokenSetCode() + " - " + card.getName());
         return null;
     }
+    
+    /**
+     *
+     * @param card
+     * @return String regardless of whether image exists
+     */
+    public static String generateFullTokenImagePath(CardDownloadData card) {
+        if (card.isToken()) {
+            String filePath = getTokenImagePath(card);
+            return filePath;
+        }
+        return "";
+    }
 
     private static String getTokenImagePath(CardDownloadData card) {
         String filename = generateImagePath(card);