diff --git a/MobArena.jar b/MobArena.jar
index f39c540..984ccc1 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/src/com/garbagemule/MobArena/Arena.java b/src/com/garbagemule/MobArena/Arena.java
index e701687..0f6fbb6 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -1156,7 +1156,10 @@ public class Arena
     public Location getBossSpawnpoint()
     {
         if (spawnpointsBoss.isEmpty())
-            return getSpawnpoints().get(0);
+        {
+            List<Location> points = WaveUtils.getValidSpawnpoints(this, getLivingPlayers());
+            return points.get(MobArena.random.nextInt(points.size()));
+        }
         
         return new ArrayList<Location>(spawnpointsBoss.values()).get(MobArena.random.nextInt(spawnpointsBoss.size()));
     }