diff --git a/world/src/layer/cave.rs b/world/src/layer/cave.rs
index 17d0b766a2..cb55263331 100644
--- a/world/src/layer/cave.rs
+++ b/world/src/layer/cave.rs
@@ -940,8 +940,9 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
         }
     }
 
-    // Occasionally place down a waypoint
+    // FIXME: Add back waypoints once caves are not impossible to escape.
+    /* // Occasionally place down a waypoint
     if RandomField::new(canvas.info().index().seed).chance(wpos, 0.000005) {
         canvas.spawn(EntityInfo::at(wpos.map(|e| e as f32)).into_waypoint());
-    }
+    } */
 }