diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 3aa7335b..5924b288 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -84,6 +84,10 @@ public class TpCommand extends BasicCommand {
         if(target == null)
             return null;
 
+        Subserver subserver = Subserver.getSubserver(target);
+        if(subserver != null)
+            return subserver.getServer();
+
         return target.getServer().getInfo();
     }