diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java b/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java
index 86fb9993..32354a47 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java
@@ -48,6 +48,11 @@ public class SpawnLocator extends SpawnLocating {
             while (world.isAir(mutable) && mutable.getY() >= spawnPos.getY() - spawnRadius * 2 && !world.isOutOfHeightLimit(mutable)) {
                 mutable.move(0, -1, 0);
             }
+
+            if (!world.getFluidState(mutable).isEmpty()) {
+                continue;
+            }
+
             if (!world.isAir(mutable)) {
                 mutable.move(0, 1, 0);
             }