diff --git a/src/main/java/com/alttd/halloween/leaderboard/Leaderboard.java b/src/main/java/com/alttd/halloween/leaderboard/Leaderboard.java
index f7b4b73..95aacb8 100644
--- a/src/main/java/com/alttd/halloween/leaderboard/Leaderboard.java
+++ b/src/main/java/com/alttd/halloween/leaderboard/Leaderboard.java
@@ -88,11 +88,13 @@ public class Leaderboard {
     }
 
     public void addViewer(Player player) {
-        if (viewers.put(player.getUniqueId(), player) == null) {
+        if (viewers.containsKey(player.getUniqueId())) {
             return; //Player was already in viewers list
         }
         protocolManager.sendServerPacket(player, title.entitySpawnPacket());
         lines.forEach(line -> protocolManager.sendServerPacket(player, line.entitySpawnPacket()));
+        updateScoreboard(player);
+        viewers.put(player.getUniqueId(), player);
     }
 
     public void removeViewer(Player player) {