diff --git a/zone/merc.cpp b/zone/merc.cpp
index a32fab994..82d66878a 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -1303,7 +1303,7 @@ bool Merc::Process()
 		_check_confidence = true;
 	}
 
-	if (sendhpupdate_timer.Check()) {
+	if (send_hp_update_timer.Check()) {
 		SendHPUpdate();
 	}
 
diff --git a/zone/npc.cpp b/zone/npc.cpp
index 3ada452d1..7cf31b617 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -116,7 +116,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, const glm::vec4& position, int if
 	knightattack_timer(1000),
 	assist_timer(AIassistcheck_delay),
 	qglobal_purge_timer(30000),
-	sendhpupdate_timer(2000),
+	send_hp_update_timer(2000),
 	enraged_timer(1000),
 	taunt_timer(TauntReuseTime * 1000),
 	m_SpawnPoint(position),
@@ -745,11 +745,11 @@ bool NPC::Process()
 		}
 	}
 
-	// we might actually want to reset in this check ... won't until issues arise at least :P
-	if (sendhpupdate_timer.Check(false) && (IsTargeted() || (IsPet() && GetOwner() && GetOwner()->IsClient()))) {
-		if(!IsFullHP || cur_hp<max_hp){
-			SendHPUpdate();
-		}
+	/**
+	 * Send HP updates when engaged
+	 */
+	if (send_hp_update_timer.Check(false) && this->IsEngaged()) {
+		SendHPUpdate();
 	}
 
 	if(HasVirus()) {
diff --git a/zone/npc.h b/zone/npc.h
index cba67c698..471b47557 100644
--- a/zone/npc.h
+++ b/zone/npc.h
@@ -423,7 +423,7 @@ public:
 	void	SetHeroForgeModel(uint32 model) { herosforgemodel = model; }
 
 	bool IsRaidTarget() const { return raid_target; };
-	void ResetHPUpdateTimer() { sendhpupdate_timer.Start(); }
+	void ResetHPUpdateTimer() { send_hp_update_timer.Start(); }
 
 	bool IgnoreDespawn() { return ignore_despawn; }
 
@@ -456,7 +456,7 @@ protected:
 	Timer	qglobal_purge_timer;
 
 	bool	combat_event;	//true if we are in combat, false otherwise
-	Timer	sendhpupdate_timer;
+	Timer	send_hp_update_timer;
 	Timer	enraged_timer;
 	Timer *reface_timer;