diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e9843c40..5dec5f65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -507,6 +507,7 @@ public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cau
         	//Thermos....transfer them correctly?!
         	 this.getHandle().mcServer.getConfigurationManager().transferPlayerToDimension_CB(this.getHandle(),toWorld.dimension, new thermos.ThermiteTeleporter(toWorld));
         	 this.getHandle().playerNetServerHandler.teleport(to);
+        	 this.getHandle().mountEntity(null);
         	 //this.getHandle().playerNetServerHandler.setPlayerLocation(to.getX(), to.getY(), to.getZ(), this.getHandle().rotationYaw, this.getHandle().rotationPitch);
         	//server.getHandle().respawnPlayer(entity, toWorld.dimension, false, to, false); // Cauldron
         }