diff --git a/src/de/steamwar/bungeecore/commands/TeamCommand.java b/src/de/steamwar/bungeecore/commands/TeamCommand.java
index 16c98735..af3a84ba 100644
--- a/src/de/steamwar/bungeecore/commands/TeamCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TeamCommand.java
@@ -248,14 +248,15 @@ public class TeamCommand extends BasicCommand {
         if(notInTeam(player, user))
             return;
 
-        if(team.size() > 1 && user.isLeader() && team.getMembers().stream().map(SteamwarUser::get).filter(member -> user != member).noneMatch(SteamwarUser::isLeader)){
+        int teamSize = team.size();
+        if(teamSize > 1 && user.isLeader() && team.getMembers().stream().map(SteamwarUser::get).filter(member -> user != member).noneMatch(SteamwarUser::isLeader)){
             Message.send("TEAM_OTHER_LEADER_REQUIRED", player);
             return;
         }
 
         user.setTeam(0);
 
-        if(user.isLeader() && team.size() > 0){
+        if(teamSize == 1){
             team.disband(user);
         }