diff --git a/src/main/java/de/fanta/challenges/challenges/MobRemoveWorldChallenge.java b/src/main/java/de/fanta/challenges/challenges/MobRemoveWorldChallenge.java
index ac5c821..906d3cb 100644
--- a/src/main/java/de/fanta/challenges/challenges/MobRemoveWorldChallenge.java
+++ b/src/main/java/de/fanta/challenges/challenges/MobRemoveWorldChallenge.java
@@ -70,11 +70,11 @@
                     for (int y = worldMinHeight; y < worldMaxHeight; y++) {
                         Block block = world.getBlockAt((int) Math.round(x), y, (int) Math.round(z));
                         if (replaceBedrock) {
-                            if (block.getType() != Material.AIR) {
+                            if (block.getType() != Material.AIR && block.getType() != Material.END_PORTAL_FRAME) {
                                 block.setType(Material.AIR, false);
                             }
                         } else {
-                            if (block.getType() != Material.AIR && block.getType() != Material.BEDROCK) {
+                            if (block.getType() != Material.AIR && block.getType() != Material.BEDROCK && block.getType() != Material.END_PORTAL_FRAME) {
                                 block.setType(Material.AIR, false);
                             }
                         }