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 0dcee21..d23f1bf 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
@@ -96,6 +96,8 @@ public class Listeners implements Listener {
     public void onJoinEvent(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
+        if(player.hasMetadata(HAS_WARPED)) player.removeMetadata(HAS_WARPED, plugin);
+
         Portal.joinCooldown.put(player.getName(), System.currentTimeMillis());
 
         Location loc = player.getLocation();