diff --git a/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java b/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java
index ff5b0eaf4..7daa8dd2a 100644
--- a/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java
@@ -17,11 +17,10 @@ public class ScoreboardChangeTask extends BukkitRunnable {
 
     @Override
     public void run() {
-        if (!player.isOnline()) {
-            return;
+        if (player.isOnline()) {
+            player.setScoreboard(oldScoreboard);
         }
 
-        player.setScoreboard(oldScoreboard);
         ScoreboardManager.clearPendingTask(player.getName());
     }
 }