diff --git a/src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java b/src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java
index ac2fd17..bb51f01 100644
--- a/src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java
+++ b/src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java
@@ -17,6 +17,7 @@ import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * The portal teleporter takes care of the actual portal teleportation for any vehicles
@@ -169,7 +170,8 @@ public class VehicleTeleporter extends EntityTeleporter {
             return;
         }
         //Spawn a new vehicle
-        Vehicle newVehicle = vehicleWorld.spawn(exit, teleportingVehicle.getClass());
+        Vehicle newVehicle = (Vehicle) vehicleWorld.spawn(exit,
+                Objects.requireNonNull(teleportingVehicle.getType().getEntityClass()));
         if (teleportingVehicle instanceof Boat boat) {
             ((Boat) newVehicle).setBoatType(boat.getBoatType());
         }