diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index cf9a8b7b4b1..86653eb178b 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -128,7 +128,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
 
     private CardEdition(CardInSet[] cards) {
         this.cards = cards;
-        tokenNormalized = null;
+        tokenNormalized = new HashMap<>();
     }
 
     private CardEdition(CardInSet[] cards, Map<String, Integer> tokens) {