diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index d67bbf3..cd4ccb3 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -6,6 +6,7 @@ import de.steamwar.bausystem.world.BauScoreboard;
 import de.steamwar.bausystem.world.RegionListener;
 import de.steamwar.bausystem.world.TNTListener;
 import de.steamwar.core.CommandRemover;
+import de.steamwar.scoreboard.SWScoreboard;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -117,6 +118,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     @EventHandler
     public void onLeave(PlayerQuitEvent e) {
+        SWScoreboard.removeScoreboard(e.getPlayer());
         if(Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().size() == 1 && Bukkit.getOnlinePlayers().contains(e.getPlayer())))
             Bukkit.shutdown();
     }