diff --git a/src/de/steamwar/bungeecore/commands/TeamCommand.java b/src/de/steamwar/bungeecore/commands/TeamCommand.java
index 970793c5..b6926b99 100644
--- a/src/de/steamwar/bungeecore/commands/TeamCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TeamCommand.java
@@ -584,7 +584,9 @@ public class TeamCommand extends BasicCommand {
         }
         ServerInfo serverInfo = Storage.teamServers.computeIfAbsent(targetTeam.getTeamId(), integer -> {
             InetSocketAddress address = new InetSocketAddress(targetTeam.getAddress(), targetTeam.getPort());
-            return ProxyServer.getInstance().constructServerInfo("Team " + targetTeam.getTeamKuerzel(), address, "SteamWar.de - Teamserver", false);
+            ServerInfo info = ProxyServer.getInstance().constructServerInfo("Team " + targetTeam.getTeamKuerzel(), address, "SteamWar.de - Teamserver", false);
+            ProxyServer.getInstance().getServers().put(info.getName(), info);
+            return info;
         });
         player.connect(serverInfo);
     }