diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
index 871ac80..c211183 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
@@ -105,7 +105,7 @@ public class Tier extends PluginDependent {
         this.requiredTierForApplication = this.getConfig().getString("requires-tier");
         NamespacedKey key = this.getPlugin().getNamespacedKeyFactory().create("upgrade_crystal");
 
-        ItemStack out = new ItemStack(Material.END_CRYSTAL);
+        ItemStack out = new ItemStack(Objects.requireNonNull(Material.getMaterial(this.getPlugin().getConfigYml().getString("upgrade-crystal-material").toUpperCase())));
         ItemMeta outMeta = out.getItemMeta();
         assert outMeta != null;
         PersistentDataContainer container = outMeta.getPersistentDataContainer();
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java
index 90bb23d..f3a53bf 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/listeners/CrystalListener.java
@@ -36,10 +36,6 @@ public class CrystalListener extends PluginDependent implements Listener {
             return;
         }
 
-        if (cursor.getType() != Material.END_CRYSTAL) {
-            return;
-        }
-
         Tier crystalTier = ArmorUtils.getCrystalTier(cursor);
 
         if (crystalTier == null) {
@@ -84,9 +80,6 @@ public class CrystalListener extends PluginDependent implements Listener {
     @EventHandler
     public void onPlaceCrystal(@NotNull final BlockPlaceEvent event) {
         ItemStack item = event.getItemInHand();
-        if (item.getType() != Material.END_CRYSTAL) {
-            return;
-        }
 
         if (ArmorUtils.getCrystalTier(item) != null) {
             event.setCancelled(true);
diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml
index f4d318b..b799d7b 100644
--- a/eco-core/core-plugin/src/main/resources/config.yml
+++ b/eco-core/core-plugin/src/main/resources/config.yml
@@ -5,8 +5,8 @@
 
 discover-recipes: true # If all recipes should be automatically discovered.
 
-# The material for advancement shards.
-advancement-shard-material: prismarine_shard
+advancement-shard-material: prismarine_shard # The material for advancement shards.
+upgrade-crystal-material: end_crystal # The material for upgrade crystals.
 
 # Effects are passive abilities that happen when wearing a full set with the effect present.
 effects: