diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
index 1c29dba..7169cae 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
@@ -89,7 +89,20 @@ public class Listeners implements Listener {
 
     @EventHandler
     public void onJoinEvent(PlayerJoinEvent event) {
-        Portal.joinCooldown.put(event.getPlayer().getName(), System.currentTimeMillis());
+    	Player player = event.getPlayer();
+		
+    	Portal.joinCooldown.put(player.getName(), System.currentTimeMillis());
+	
+    	String uuid = player.getUniqueId().toString();
+    	
+    	if (plugin.PlayerDestiMap.containsKey(uuid)) {
+			plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+				Destination.warp(player, plugin.PlayerDestiMap.get(uuid), false, true);
+				plugin.PlayerDestiMap.remove(uuid);
+				
+			}, 1L);
+			
+    	}
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)