diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 39d9c450fb5..e669ffacd82 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -174,7 +174,7 @@ public final class CardDb implements ICardDatabase {
                 ? ( fromLastSet ? this.uniqueCardsByName.get(splitName.get(0)) : tryGetCard(splitName.get(0), Aggregates.random(this.allCardsByName.get(splitName.get(0))).getEdition(), -1))
                 : tryGetCard(splitName.get(0), splitName.get(1), Integer.parseInt(splitName.get(2)));
 
-        if (fromLastSet && null != res) {
+        if (fromLastSet && null != res && CardEdition.UNKNOWN.getCode() != res.getEdition()) {
             final PaperCard res_randart = tryGetCard(res.getName(), res.getEdition(), Integer.parseInt(splitName.get(2)));
             return null != res_randart && isFoil ? getFoiled(res_randart) : res_randart;
         }