diff --git a/src/de/steamwar/misslewars/listener/ConnectionListener.java b/src/de/steamwar/misslewars/listener/ConnectionListener.java
index 245598f..0971a28 100644
--- a/src/de/steamwar/misslewars/listener/ConnectionListener.java
+++ b/src/de/steamwar/misslewars/listener/ConnectionListener.java
@@ -49,7 +49,7 @@ public class ConnectionListener extends BasicListener{
 		MWTeam.removeInvitations(e.getPlayer());
 		MissileWars.leave(e.getPlayer());
 
-		if (Bukkit.getOnlinePlayers().isEmpty()) {
+		if (Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().contains(e.getPlayer()) && Bukkit.getOnlinePlayers().size() == 1)) {
 			Bukkit.shutdown();
 		}
 	}
diff --git a/src/de/steamwar/misslewars/listener/WaitingListener.java b/src/de/steamwar/misslewars/listener/WaitingListener.java
index 744c9d2..1180edc 100644
--- a/src/de/steamwar/misslewars/listener/WaitingListener.java
+++ b/src/de/steamwar/misslewars/listener/WaitingListener.java
@@ -34,8 +34,9 @@ public class WaitingListener extends BasicListener {
 
 	@EventHandler
 	public void onDisconnect(PlayerQuitEvent e){
-		if(Bukkit.getOnlinePlayers().isEmpty())
+		if (Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().contains(e.getPlayer()) && Bukkit.getOnlinePlayers().size() == 1)) {
 			Bukkit.shutdown();
+		}
 	}
 
 	@EventHandler