diff --git a/ansible/files/paper-config/bukkit.yml b/ansible/files/paper-config/bukkit.yml
index 139e9fba8..400395e2d 100644
--- a/ansible/files/paper-config/bukkit.yml
+++ b/ansible/files/paper-config/bukkit.yml
@@ -1,5 +1,5 @@
 settings:
-  allow-end: true
+  allow-end: false
   warn-on-overload: true
   permissions-file: permissions.yml
   update-folder: update
diff --git a/ansible/variables/settings.yml b/ansible/variables/settings.yml
index 6acfb6d8d..b72d2a854 100644
--- a/ansible/variables/settings.yml
+++ b/ansible/variables/settings.yml
@@ -7,7 +7,7 @@ settings:
       enabled: true
     minecraft: &default_minecraft
       enabled: true
-      whitelist: true
+      whitelist: false
       pvp_whitelist: false
       pvp_hostname: 'pvp.civmc.net'
       hostname: 'play.civmc.net'
diff --git a/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/PortalModifyHack.java b/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/PortalModifyHack.java
index d8b8bc1cd..0a491936c 100644
--- a/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/PortalModifyHack.java
+++ b/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/PortalModifyHack.java
@@ -90,6 +90,21 @@ public class PortalModifyHack extends BasicHack {
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void on(PlayerTeleportEvent event) {
+        if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) {
+            return;
+        }
+
+        if (event.getTo().getWorld().getEnvironment() != World.Environment.NETHER) {
+            return;
+        }
+
+        if (event.getTo().getY() >= 128) {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler
     public void onTick(ServerTickEndEvent event) {
         for (Map.Entry<Player, Location> entry : teleports.entrySet()) {