diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
index 55d30f4..bdab69a 100644
--- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
+++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
@@ -109,11 +109,10 @@ public class PlayerEventListener implements Listener {
 
         //Teleport the vehicle to the player
         Entity playerVehicle = player.getVehicle();
+        if (playerVehicle != null && !Stargate.handleVehicles) {
+            return;
+        }
         if (playerVehicle != null && !(playerVehicle instanceof Boat) && !(playerVehicle instanceof RideableMinecart)) {
-            if (!Stargate.handleVehicles) {
-                return;
-            }
-
             //Make sure the horse can be sat on
             if (playerVehicle instanceof AbstractHorse horse) {
                 //Make sure the horse is properly tamed