diff --git a/src/de/steamwar/spectatesystem/listener/PlayerSeatListener.java b/src/de/steamwar/spectatesystem/listener/PlayerSeatListener.java
index cf30126..8b9183d 100644
--- a/src/de/steamwar/spectatesystem/listener/PlayerSeatListener.java
+++ b/src/de/steamwar/spectatesystem/listener/PlayerSeatListener.java
@@ -53,11 +53,12 @@ public class PlayerSeatListener extends BasicListener {
         arrow.setGravity(false);
         arrow.setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED);
         arrow.addPassenger(event.getPlayer());
+        arrow.setPersistent(true);
     }
 
     @EventHandler
     public void onEntityDismount(EntityDismountEvent event) {
-        if(event.getEntity().getType() != EntityType.ARROW)
+        if(event.getDismounted().getType() != EntityType.ARROW)
             return;
 
         if(event.getEntityType() != EntityType.PLAYER)