diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/Permanent.java
index 51dbd8f..3ea571b 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -83,6 +83,10 @@ public class Permanent implements Listener {
         }
     }
 
+    public void handlePlayerLeave(PlayerQuitEvent event) {
+        event.setQuitMessage(null);
+    }
+
     @EventHandler
     public void handleFoodLevelChange(FoodLevelChangeEvent event) {
         event.setCancelled(true);
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/SetupQuit.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/SetupQuit.java
index e4360dd..3b083e7 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/SetupQuit.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/SetupQuit.java
@@ -37,8 +37,6 @@ public class SetupQuit implements Listener {
 
     @EventHandler
     public void handlePlayerQuit(PlayerQuitEvent event) {
-        event.setQuitMessage(null);
-
         Player player = event.getPlayer();
         FightTeam team = Fight.getPlayerTeam(player);
         if(team == null)