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 90dab6789..ff5b0eaf4 100644
--- a/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/scoreboards/ScoreboardChangeTask.java
@@ -18,9 +18,10 @@ public class ScoreboardChangeTask extends BukkitRunnable {
     @Override
     public void run() {
         if (!player.isOnline()) {
-            player.setScoreboard(oldScoreboard);
+            return;
         }
 
+        player.setScoreboard(oldScoreboard);
         ScoreboardManager.clearPendingTask(player.getName());
     }
 }