diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
index 12585d01..2679df64 100644
--- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
+++ b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
@@ -82,7 +82,11 @@ public class LimboCache {
      */
     public void deleteLimboPlayer(String name) {
         checkNotNull(name);
-        cache.remove(name.toLowerCase());
+        name = name.toLowerCase();
+        if (cache.containsKey(name)) {
+            cache.get(name).clearTask();
+            cache.remove(name);
+        }
     }
 
     /**