diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
index 9cfc4f3..55d30f4 100644
--- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
+++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
@@ -110,6 +110,9 @@ public class PlayerEventListener implements Listener {
         //Teleport the vehicle to the player
         Entity playerVehicle = player.getVehicle();
         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) {