diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/SpawnStorage.java
index c8d2e7308..8cd7c850a 100644
--- a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/SpawnStorage.java
+++ b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/SpawnStorage.java
@@ -51,6 +51,9 @@ public class SpawnStorage implements IEssentialsModule, IConf {
         group = group.toLowerCase(Locale.ENGLISH);
         synchronized (spawns) {
             if (!spawns.containsKey(group)) {
+                if (spawns.containsKey("default")) {
+                    return spawns.get("default").location();
+                }
                 return getWorldSpawn();
             }
             return spawns.get(group).location();