diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 2caba32031..8c981a73ec 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -606,6 +606,7 @@ impl Body {
             BuffKind::Burning => match self {
                 Body::Golem(g) => matches!(g.species, golem::Species::ClayGolem),
                 Body::BipedSmall(b) => matches!(b.species, biped_small::Species::Haniwa),
+                Body::Object(object::Body::HaniwaSentry) => true,
                 _ => false,
             },
             _ => false,
diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index ff15d58702..f0acba138b 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -671,34 +671,43 @@ impl Floor {
                                         },
                                     },
                                 )),
-                            3 => entity
-                                .with_body(comp::Body::BipedSmall(
-                                    comp::biped_small::Body::random_with(
-                                        dynamic_rng,
-                                        &comp::biped_small::Species::Haniwa,
-                                    ),
-                                ))
-                                .with_name("Haniwa")
-                                .with_loadout_config(loadout_builder::LoadoutConfig::Haniwa)
-                                .with_skillset_config(
-                                    common::skillset_builder::SkillSetConfig::Haniwa,
-                                )
-                                .with_loot_drop(chosen.read().choose().to_item())
-                                .with_main_tool(comp::Item::new_from_asset_expect(
-                                    match dynamic_rng.gen_range(0..5) {
-                                        0 => {
-                                            "common.items.npc_weapons.biped_small.haniwa.adlet_bow"
+                            3 => match dynamic_rng.gen_range(0..4) {
+                                0 => entity
+                                    .with_body(comp::Body::Object(comp::object::Body::HaniwaSentry))
+                                    .with_name("Haniwa Sentry".to_string())
+                                    .with_loot_drop(comp::Item::new_from_asset_expect(
+                                        "common.items.crafting_ing.stones",
+                                    )),
+                                _ => entity
+                                    .with_body(comp::Body::BipedSmall(
+                                        comp::biped_small::Body::random_with(
+                                            dynamic_rng,
+                                            &comp::biped_small::Species::Haniwa,
+                                        ),
+                                    ))
+                                    .with_name("Haniwa")
+                                    .with_loadout_config(loadout_builder::LoadoutConfig::Haniwa)
+                                    .with_skillset_config(
+                                        common::skillset_builder::SkillSetConfig::Haniwa,
+                                    )
+                                    .with_loot_drop(chosen.read().choose().to_item())
+                                    .with_main_tool(comp::Item::new_from_asset_expect(
+                                        match dynamic_rng.gen_range(0..5) {
+                                            0 => {
+                                                "common.items.npc_weapons.biped_small.haniwa.\
+                                                 adlet_bow"
+                                            },
+                                            1 => {
+                                                "common.items.npc_weapons.biped_small.haniwa.\
+                                                 gnoll_staff"
+                                            },
+                                            _ => {
+                                                "common.items.npc_weapons.biped_small.haniwa.\
+                                                 wooden_spear"
+                                            },
                                         },
-                                        1 => {
-                                            "common.items.npc_weapons.biped_small.haniwa.\
-                                             gnoll_staff"
-                                        },
-                                        _ => {
-                                            "common.items.npc_weapons.biped_small.haniwa.\
-                                             wooden_spear"
-                                        },
-                                    },
-                                )),
+                                    )),
+                            },
                             4 => entity
                                 .with_body(comp::Body::BipedSmall(
                                     comp::biped_small::Body::random_with(