diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
index 99afeb9..7bc8f02 100644
--- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
+++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
@@ -76,7 +76,7 @@
     public void onPlayerQuit(PlayerQuitEvent e) {
         Player player = e.getPlayer();
 
-        if (Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() == 1) {
+        if (Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1 == 0) {
             plugin.getTimer().stopTimer();
         }
 
@@ -84,12 +84,13 @@
             e.setQuitMessage(Challenges.CHALLENGESPREFIX + " " + ChatColor.of("#3D98DC") + player.getName() + ChatColor.of("#C45B3D") + " hat die Lobby verlassen! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]");
             this.plugin.getSBManager().removeScoreboard(player);
 
-            if (plugin.getCurrentEditor() != null && player.getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) {
-                if (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers() - 1 > 0) {
+            if (Bukkit.getServer().getOnlinePlayers().size() - 1 == 0) {
+                System.out.println("Reset ohne Vanish");
+                resetTaskId = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm");
+                }, 10 * 60 * 20);
+                if (plugin.getCurrentEditor() != null && player.getUniqueId().equals(plugin.getCurrentEditor().getUniqueId())) {
                     plugin.updateEditor();
-                    resetTaskId = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-                        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm");
-                    }, 10 * 60 * 20);
                 } else {
                     plugin.setCurrentEditor(null);
                 }
@@ -103,7 +104,8 @@
                 }, 1L);
             }
         } else {
-            if (Bukkit.getServer().getOnlinePlayers().size() - 1 > 0) {
+            if (Bukkit.getServer().getOnlinePlayers().size() - 1 == 0) {
+                System.out.println("Reset mit Vanish");
                 resetTaskId = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
                     Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm");
                 }, 10 * 60 * 20);