diff --git a/crates/battle-server/src/logic/property_util.rs b/crates/battle-server/src/logic/property_util.rs
index 4840086..cd04694 100644
--- a/crates/battle-server/src/logic/property_util.rs
+++ b/crates/battle-server/src/logic/property_util.rs
@@ -626,6 +626,10 @@ fn remove_custom_properties(properties: &mut HashMap<u32, i32>) {
 }
 
 fn set_battle_properties(properties: &mut HashMap<u32, i32>) {
+    properties.insert(
+        EPropertyType::Hp.into(),
+        *properties.get(&EPropertyType::HpMax.into()).unwrap_or(&0),
+    );
     properties.insert(
         EPropertyType::HpMaxBattle.into(),
         *properties.get(&EPropertyType::HpMax.into()).unwrap_or(&0),
diff --git a/crates/trigger-logic/src/battle.rs b/crates/trigger-logic/src/battle.rs
index c0fe23a..24ee765 100644
--- a/crates/trigger-logic/src/battle.rs
+++ b/crates/trigger-logic/src/battle.rs
@@ -3,6 +3,7 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 #[repr(u32)]
 #[derive(IntoPrimitive, TryFromPrimitive)]
 pub enum EPropertyType {
+    Hp = 1,
     HpMax = 111,
     Atk = 121,
     BreakStun = 122,