diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index a5fc4773..04cbb02e 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -53,11 +53,10 @@ public class TpCommand extends BasicCommand {
         }
 
         ServerInfo server = getTarget(args[0]);
-        ServerInfo teamServer = Storage.teamServers.get(sender.user().getTeam());
-        System.out.println(teamServer + " " + sender.user().getTeam());
+        boolean onTeamServer = Storage.teamServers.containsValue(player.getServer().getInfo());
 
         //Give control of teleport command to server
-        if (server == player.getServer().getInfo() || teamServer == player.getServer().getInfo()) {
+        if (server == player.getServer().getInfo() || onTeamServer) {
             Chat19.chat(player, "/tp " + String.join(" ", args));
             return;
         }