diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java
index 4af631d6b0..fa6a9be8e5 100644
--- a/Mage/src/main/java/mage/cards/ExpansionSet.java
+++ b/Mage/src/main/java/mage/cards/ExpansionSet.java
@@ -68,8 +68,6 @@ public abstract class ExpansionSet implements Serializable {
     protected String packageName;
     protected int maxCardNumberInBooster; // used to ommit cards with collector numbers beyond the regular cards in a set for boosters
 
-    protected boolean isCustomSet = false;
-
     protected final EnumMap<Rarity, List<CardInfo>> savedCards;
 
     public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) {
@@ -376,7 +374,7 @@ public abstract class ExpansionSet implements Serializable {
         return null;
     }
 
-    public boolean isCustomSet() { return isCustomSet; }
+    public boolean isCustomSet() { return setType == SetType.CUSTOM_SET; }
 
     public void removeSavedCards() {
         savedCards.clear();
diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java
index 794b8e0536..642bef29bb 100644
--- a/Mage/src/main/java/mage/cards/Sets.java
+++ b/Mage/src/main/java/mage/cards/Sets.java
@@ -73,7 +73,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
     public void addSet(ExpansionSet set) {
         if(containsKey(set.getCode())) throw new IllegalArgumentException("Set code "+set.getCode()+" already exists.");
         this.put(set.getCode(), set);
-        if(set.isCustomSet) customSets.add(set.getCode());
+        if(set.isCustomSet()) customSets.add(set.getCode());
     }
 
     public static boolean isCustomSet(String setCode) {
diff --git a/Mage/src/main/java/mage/constants/SetType.java b/Mage/src/main/java/mage/constants/SetType.java
index b53d73dd56..ed23a233bb 100644
--- a/Mage/src/main/java/mage/constants/SetType.java
+++ b/Mage/src/main/java/mage/constants/SetType.java
@@ -11,7 +11,8 @@ public enum SetType {
     SUPPLEMENTAL("Supplemental"),
     SUPPLEMENTAL_STANDARD_LEGAL("Standard Legal Supplemental"),
     PROMOTIONAL("Promotional"),
-    JOKESET("Joke Set");
+    JOKESET("Joke Set"),
+    CUSTOM_SET("Unofficial Set");
 
     private final String text;