diff --git a/src/de/steamwar/spectatesystem/PlayerSetup.java b/src/de/steamwar/spectatesystem/PlayerSetup.java
index 3e1bd17..255e6b5 100644
--- a/src/de/steamwar/spectatesystem/PlayerSetup.java
+++ b/src/de/steamwar/spectatesystem/PlayerSetup.java
@@ -60,7 +60,6 @@ public class PlayerSetup {
     private static void playerJoinsLobby(Player player){
         player.setAllowFlight(true);
         player.setFlying(false);
-        player.teleport(Config.SpecSpawn);
         player.getInventory().clear();
         for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) {
             if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() != GameMode.SPECTATOR) {
@@ -97,7 +96,6 @@ public class PlayerSetup {
         }, 2);
 
         player.getInventory().clear();
-        player.teleport(Config.SpecSpawn);
         arenaPlayers.add(player);
     }
 }
diff --git a/src/de/steamwar/spectatesystem/listener/JoinListener.java b/src/de/steamwar/spectatesystem/listener/JoinListener.java
index 65a3631..986511e 100644
--- a/src/de/steamwar/spectatesystem/listener/JoinListener.java
+++ b/src/de/steamwar/spectatesystem/listener/JoinListener.java
@@ -20,6 +20,7 @@
 package de.steamwar.spectatesystem.listener;
 
 import de.steamwar.scoreboard.SWScoreboard;
+import de.steamwar.spectatesystem.Config;
 import de.steamwar.spectatesystem.PlayerSetup;
 import de.steamwar.spectatesystem.SpectateSystem;
 import de.steamwar.spectatesystem.elements.REntity;
@@ -34,6 +35,7 @@ public class JoinListener extends BasicListener {
     public void onJoin(PlayerJoinEvent e){
         e.setJoinMessage(null);
         Player player = e.getPlayer();
+        player.teleport(Config.SpecSpawn);
         REntity.playerJoins(player);
         PlayerSetup.playerJoins(player);
         SWScoreboard.createScoreboard(player, SpectateSystem.getScoreboard());