diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java
index 5b39a934..f0fe0b8e 100644
--- a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java
+++ b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java
@@ -115,8 +115,10 @@ public class LimboPlayer {
      * @param messageTask The message task to set
      */
     public void setMessageTask(MessageTask messageTask, MyScheduledTask inter) {
-        if (this.messageTask != null && this.inter != null) {
+        if (this.messageTask != null) {
             this.messageTask.cancel();
+        }
+        if (this.inter != null) {
             this.inter.cancel();
         }
         this.messageTask = messageTask;