diff --git a/src/entities/livestock/pig.rs b/src/entities/livestock/pig.rs
index 36f48d5..61480ec 100644
--- a/src/entities/livestock/pig.rs
+++ b/src/entities/livestock/pig.rs
@@ -27,6 +27,7 @@ impl Pig {
                 current_path: None,
                 path_index: 0,
                 step_recovery: 0,
+                validation_cooldown: 0,
             },
             sprite: Sprite {
                 image: asset_server.load("pig.png"),
diff --git a/src/entities/livestock/rabbit.rs b/src/entities/livestock/rabbit.rs
index 44fec75..f49d67a 100644
--- a/src/entities/livestock/rabbit.rs
+++ b/src/entities/livestock/rabbit.rs
@@ -24,6 +24,7 @@ impl Rabbit {
                 current_path: None,
                 path_index: 0,
                 step_recovery: 0,
+                validation_cooldown: 0,
             },
             sprite: Sprite {
                 image: asset_server.load("rabbit.png"),
diff --git a/src/entities/sentient/dorf.rs b/src/entities/sentient/dorf.rs
index 2db0a25..2848ea2 100644
--- a/src/entities/sentient/dorf.rs
+++ b/src/entities/sentient/dorf.rs
@@ -24,6 +24,7 @@ impl Dorf {
                 current_path: None,
                 path_index: 0,
                 step_recovery: 0,
+                validation_cooldown: 0,
             },
             sprite: Sprite {
                 image: asset_server.load("dorf.png"),
diff --git a/src/entities/shared_components/ambulatory.rs b/src/entities/shared_components/ambulatory.rs
index 5244ce6..e2f4b8d 100644
--- a/src/entities/shared_components/ambulatory.rs
+++ b/src/entities/shared_components/ambulatory.rs
@@ -9,6 +9,21 @@ pub struct Ambulatory {
     pub path_index: usize,
     pub target: Option<Vec3>,
     pub step_recovery: u32,
+    pub validation_cooldown: u8,
+}
+
+impl Default for Ambulatory {
+    fn default() -> Self {
+        Self {
+            walk_speed: 1.0,
+            run_speed: 2.0,
+            current_path: None,
+            path_index: 0,
+            target: None,
+            step_recovery: 0,
+            validation_cooldown: 0,
+        }
+    }
 }
 
 #[derive(Component)]
diff --git a/src/entities/shared_systems/pathfinding.rs b/src/entities/shared_systems/pathfinding.rs
index 1de24d0..300fdb9 100644
--- a/src/entities/shared_systems/pathfinding.rs
+++ b/src/entities/shared_systems/pathfinding.rs
@@ -502,6 +502,17 @@ pub fn movement(mut query: Query<(&mut Ambulatory, &mut Transform)>, tilemap: Re
                 return;
             }
 
+            if ambulatory.validation_cooldown > 0 {
+                ambulatory.validation_cooldown -= 1;
+            } else if let Some(path) = &ambulatory.current_path {
+                if !validate_next_steps(&tilemap, path, ambulatory.path_index, 3) {
+                    ambulatory.current_path = None;
+                    ambulatory.validation_cooldown = 10;
+                    return;
+                }
+                ambulatory.validation_cooldown = 10;
+            }
+
             if ambulatory.walk_speed > 0. {
                 if ambulatory.step_recovery <= ambulatory.walk_speed as u32 {
                     ambulatory.step_recovery += 1;
@@ -534,6 +545,17 @@ pub fn movement(mut query: Query<(&mut Ambulatory, &mut Transform)>, tilemap: Re
         });
 }
 
+fn validate_next_steps(tilemap: &TileMap, path: &[Vec3], start_index: usize, steps: usize) -> bool {
+    let end = (start_index + steps).min(path.len());
+    for i in start_index..end {
+        let pos = path[i].as_ivec3();
+        if !is_standable_tile(tilemap, pos) {
+            return false;
+        }
+    }
+    true
+}
+
 fn is_standable_tile(tilemap: &TileMap, pos: IVec3) -> bool {
     let can_stand_in_tile = tilemap
         .floor_tiles