diff --git a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java
index 5020040..70d18bb 100644
--- a/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java
+++ b/src/main/java/de/fanta/challenges/challenges/AllItemsChallenge.java
@@ -24,12 +24,14 @@
     public static Material item;
     public static List<String> items = new ArrayList<>();
 
+    private static final Challenges plugin = Challenges.getPlugin();
+
     public static void start() {
-        if (items.size() == 0) {
+        if (items.isEmpty()) {
             for (Material mat : Material.values()) {
-                items.add(mat.toString());
+                if (mat.isItem() && !mat.isAir() && !plugin.getNotAvailableMaterials().contains(mat))
+                    items.add(mat.toString());
             }
-            items.removeIf(str -> str.contains("WALL_") || str.contains("SPAWN_EGG") || str.equalsIgnoreCase("AIR") || str.equalsIgnoreCase("BEDROCK") || str.contains("PORTAL"));
         }
         if (item == null) {
             Random r = new Random();