diff --git a/src/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/com/garbagemule/MobArena/ArenaMasterImpl.java
index 4dc5c3c7f..c51fc93 100644
--- a/src/com/garbagemule/MobArena/ArenaMasterImpl.java
+++ b/src/com/garbagemule/MobArena/ArenaMasterImpl.java
@@ -86,6 +86,9 @@ public class ArenaMasterImpl implements ArenaMaster
     }
 
     public Arena getSelectedArena() {
+        if (selectedArena == null && !arenas.isEmpty()) {
+            selectedArena = arenas.get(0);
+        }
         return selectedArena;
     }