diff --git a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
index 419ee99..fbd4581 100644
--- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
@@ -146,15 +146,11 @@ public class EventHandlerImpl implements EventHandler {
 
     @Override
     public void onPlayerJoin(AdaptedPlayer player) {
-        new Thread(() -> {
-            try {
-                TimeUnit.SECONDS.sleep(2);
-            } catch (InterruptedException ignored) {
-            }
-            if (main.getUpdater().isUpdateAvailable() && player.hasPermission("ajqueue.manage.update")) {
+        main.getTaskManager().runLater(() -> {
+            if (main.getUpdater().isUpdateAvailable() && !main.getUpdater().isAlreadyDownloaded() && player.hasPermission("ajqueue.manage.update")) {
                 player.sendMessage(main.getMessages().getComponent("updater.update-available"));
             }
-        }).start();
+        }, 2, TimeUnit.SECONDS);
 
         ImmutableList<QueuePlayer> queues = main.getQueueManager().findPlayerInQueues(player);
         for(QueuePlayer queuePlayer : queues) {