diff --git a/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java
index b04f2e4..13f9d3a 100644
--- a/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java
+++ b/src/main/java/de/fanta/challenges/challenges/ForceItemChallengeEvent.java
@@ -206,16 +206,6 @@
         }
     }
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onPort(PlayerTeleportEvent e) {
-        if (!isRunning()) {
-            return;
-        }
-        Player player = e.getPlayer();
-
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> addArmorStand(player), 5L);
-    }
-
     @EventHandler
     public void onPickUpItem(PlayerAttemptPickupItemEvent e) {
         ItemStack itemStack = e.getItem().getItemStack();
@@ -438,6 +428,16 @@
                 for (Entity entity : player.getPassengers()) {
                     entity.setRotation(location.getYaw(), location.getPitch());
                 }
+
+                if (location.getPitch() < -50) {
+                    for (Entity entity : player.getPassengers()) {
+                        player.hideEntity(plugin, entity);
+                    }
+                } else {
+                    for (Entity entity : player.getPassengers()) {
+                        player.showEntity(plugin, entity);
+                    }
+                }
             }
         }
     }