diff --git a/src/de/steamwar/misslewars/listener/JoinListener.java b/src/de/steamwar/misslewars/listener/JoinListener.java
index 83a9bd7..e9c648a 100644
--- a/src/de/steamwar/misslewars/listener/JoinListener.java
+++ b/src/de/steamwar/misslewars/listener/JoinListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
 import org.bukkit.event.EventHandler;
@@ -35,6 +36,7 @@ public class JoinListener extends BasicListener {
 
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onJoin(PlayerJoinEvent e){
+		if (Config.isChallenge()) return;
 		MissileWars.join(e.getPlayer());
 		e.setJoinMessage("§a» " + e.getPlayer().getDisplayName());
 	}