diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index cd27d76..6f62b9e 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -56,7 +56,7 @@ public class TpCommand extends BasicCommand {
         ServerInfo teamServer = Storage.teamServers.get(sender.user().getTeam());
 
         //Give control of teleport command to server
-        if (server == player.getServer().getInfo() || (teamServer != null && player.getServer().getInfo() == teamServer)) {
+        if (server == player.getServer().getInfo() || teamServer == player.getServer().getInfo()) {
             Chat19.chat(player, "/tp " + String.join(" ", args));
             return;
         }