diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d9dbbaa5..73ed9f13e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [23.3.4] 3/14/2025
+
+### Fixes
+
+* Add check for simultaneous direct vendor and parcel Trader/Buyer Purchase ([#4778](https://github.com/EQEmu/Server/pull/4778)) @neckkola 2025-03-14
+* Fix for rare circumstance where NPC's would have 0 health on restore @Akkadius
+
 ## [23.3.3] 3/13/2025
 
 ### Database
diff --git a/common/version.h b/common/version.h
index 0940c57f3..ad7d22feb 100644
--- a/common/version.h
+++ b/common/version.h
@@ -25,7 +25,7 @@
 
 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "23.3.3-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "23.3.4-dev" // always append -dev to the current version for custom-builds
 #define LOGIN_VERSION "0.8.0"
 #define COMPILE_DATE    __DATE__
 #define COMPILE_TIME    __TIME__
diff --git a/package.json b/package.json
index 2aea52dd2..d2d067777 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "23.3.3",
+  "version": "23.3.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/EQEmu/Server.git"
diff --git a/zone/zone_save_state.cpp b/zone/zone_save_state.cpp
index 82916d372..726694ca8 100644
--- a/zone/zone_save_state.cpp
+++ b/zone/zone_save_state.cpp
@@ -312,9 +312,15 @@ inline std::vector<uint32_t> GetLootdropIds(const std::vector<ZoneStateSpawnsRep
 
 inline void LoadNPCState(Zone *zone, NPC *n, ZoneStateSpawnsRepository::ZoneStateSpawns &s)
 {
-	n->SetHP(s.hp);
-	n->SetMana(s.mana);
-	n->SetEndurance(s.endurance);
+	if (s.hp > 0) {
+		n->SetHP(s.hp);
+	}
+	if (s.mana > 0) {
+		n->SetMana(s.mana);
+	}
+	if (s.endurance > 0) {
+		n->SetEndurance(s.endurance);
+	}
 
 	if (s.grid) {
 		n->AssignWaypoints(s.grid, s.current_waypoint);