diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
index 292071a6..f2d3183b 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
@@ -37,7 +37,7 @@ public class EndCountdown extends StateDependent {
     @Override
     public void enable() {
         if (Config.isEvent()) {
-            task = Bukkit.getScheduler().runTaskLater(MissileWars.getPlugin(), this::stop, 1200);
+            task = Bukkit.getScheduler().runTaskLater(MissileWars.getPlugin(), this::stop, 200);
         } else {
             task = Bukkit.getScheduler().runTaskLater(MissileWars.getPlugin(), this::restart, Config.EndTime);
         }
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
index 0162ba53..6d631e02 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
@@ -20,6 +20,7 @@
 package de.steamwar.towerrun.countdowns;
 
 import de.steamwar.towerrun.TowerRun;
+import de.steamwar.towerrun.config.Config;
 import de.steamwar.towerrun.game.TowerRunGame;
 import de.steamwar.towerrun.state.GameStates;
 import org.bukkit.Bukkit;
@@ -48,7 +49,11 @@ public class EndCountdown extends Countdown {
     void timerEnd() {
         Bukkit.getOnlinePlayers().forEach(player -> player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1, 1));
         if (RESETS) {
-            TowerRunGame.reset();
+            if (Config.event()) {
+                Bukkit.shutdown();
+            } else {
+                TowerRunGame.reset();
+            }
             lobbyCountdown.setTime(lobbyCountdown.defaultTime());
         } else {
             Bukkit.shutdown();
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
index c93bc4bb..78fe59c5 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
@@ -62,12 +62,13 @@ public class LobbyListener extends GameStateBukkitListener {
             int team = user.getTeam();
 
             if (team != Config.EVENT_TEAM_BLUE_ID && team != Config.EVENT_TEAM_RED_ID) {
-                player.setGameMode(GameMode.SPECTATOR);
                 return;
             }
 
             if (TowerRunGame.PLAYERS_ALIVE.stream().map(towerRunPlayer -> SteamwarUser.get(towerRunPlayer.player().getUniqueId()).getTeam()).filter(integer -> integer == team).count() < Config.EVENT_MAXIMUM_TEAM_MEMBERS) {
                 TowerRunGame.PLAYERS_ALIVE.add(TowerRunPlayer.get(player));
+            } else {
+                player.setGameMode(GameMode.SPECTATOR);
             }
         } else {
             TowerRunGame.PLAYERS_ALIVE.add(TowerRunPlayer.get(player));