diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index 8dea5f3373..dea43e0a92 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -236,7 +236,7 @@ impl Default for CharacterAbility {
             swing_duration: 250,
             recover_duration: 500,
             base_damage: 10,
-            base_poise_damage: 10,
+            base_poise_damage: 0,
             knockback: 0.0,
             range: 3.5,
             max_angle: 15.0,
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 81e5ba2ee0..3ba9d8f3ae 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -181,8 +181,8 @@ impl Body {
                 theropod::Species::Snowraptor => 1.5,
                 theropod::Species::Sandraptor => 1.5,
                 theropod::Species::Woodraptor => 1.5,
-                theropod::Species::Archaeos => 4.5,
-                theropod::Species::Odonto => 4.5,
+                theropod::Species::Archaeos => 3.5,
+                theropod::Species::Odonto => 3.5,
                 _ => 1.8,
             },
             Body::BirdMedium(_) => 1.0,
@@ -610,12 +610,7 @@ impl Body {
         }
     }
 
-    pub fn base_poise_dmg(&self) -> u32 {
-        match self {
-            Body::Humanoid(_) => 5,
-            _ => 10,
-        }
-    }
+    pub fn base_poise_dmg(&self) -> u32 { 0 }
 
     pub fn base_range(&self) -> f32 {
         match self {
diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs
index 3641dba5f8..73864e0ace 100644
--- a/common/src/comp/poise.rs
+++ b/common/src/comp/poise.rs
@@ -111,13 +111,13 @@ impl Poise {
 
     /// Defines the poise states based on fraction of maximum poise
     pub fn poise_state(&self) -> PoiseState {
-        if self.current >= 8 * self.maximum / 10 {
+        if self.current >= 5 * self.maximum / 10 {
             PoiseState::Normal
-        } else if self.current >= 7 * self.maximum / 10 {
-            PoiseState::Interrupted
-        } else if self.current >= 6 * self.maximum / 10 {
-            PoiseState::Stunned
         } else if self.current >= 4 * self.maximum / 10 {
+            PoiseState::Interrupted
+        } else if self.current >= 3 * self.maximum / 10 {
+            PoiseState::Stunned
+        } else if self.current >= 2 * self.maximum / 10 {
             PoiseState::Dazed
         } else {
             PoiseState::KnockedDown
diff --git a/common/sys/src/character_behavior.rs b/common/sys/src/character_behavior.rs
index 2b6b793c82..20698f351a 100644
--- a/common/sys/src/character_behavior.rs
+++ b/common/sys/src/character_behavior.rs
@@ -171,7 +171,7 @@ impl<'a> System<'a> for Sys {
                             CharacterState::Stunned(common::states::stunned::Data {
                                 static_data: common::states::stunned::StaticData {
                                     buildup_duration: Duration::from_millis(500),
-                                    recover_duration: Duration::from_millis(500),
+                                    recover_duration: Duration::from_millis(300),
                                     movement_speed: 0.1,
                                     poise_state,
                                 },
@@ -189,8 +189,8 @@ impl<'a> System<'a> for Sys {
                         *tuple.2.get_mut_unchecked() =
                             CharacterState::Stunned(common::states::stunned::Data {
                                 static_data: common::states::stunned::StaticData {
-                                    buildup_duration: Duration::from_millis(1000),
-                                    recover_duration: Duration::from_millis(1000),
+                                    buildup_duration: Duration::from_millis(800),
+                                    recover_duration: Duration::from_millis(250),
                                     movement_speed: 0.0,
                                     poise_state,
                                 },
@@ -208,8 +208,8 @@ impl<'a> System<'a> for Sys {
                         *tuple.2.get_mut_unchecked() =
                             CharacterState::Stunned(common::states::stunned::Data {
                                 static_data: common::states::stunned::StaticData {
-                                    buildup_duration: Duration::from_millis(3000),
-                                    recover_duration: Duration::from_millis(500),
+                                    buildup_duration: Duration::from_millis(1000),
+                                    recover_duration: Duration::from_millis(750),
                                     movement_speed: 0.0,
                                     poise_state,
                                 },