diff --git a/zone/npc.cpp b/zone/npc.cpp
index b683b1bd9..8168e1e32 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -3963,3 +3963,11 @@ void NPC::HandleRoambox()
 
 	return;
 }
+
+void NPC::SetTaunting(bool is_taunting) {
+	taunting = is_taunting;
+
+	if (IsPet() && IsPetOwnerClient()) {
+		GetOwner()->CastToClient()->SetPetCommandState(PET_BUTTON_TAUNT, is_taunting);
+	}
+}
diff --git a/zone/npc.h b/zone/npc.h
index 9a703cf7b..d84d17da6 100644
--- a/zone/npc.h
+++ b/zone/npc.h
@@ -310,7 +310,7 @@ public:
 	uint16	GetPetSpellID() const {return pet_spell_id;}
 	void	SetPetSpellID(uint16 amt) {pet_spell_id = amt;}
 	uint32	GetMaxDamage(uint8 tlevel);
-	void	SetTaunting(bool tog) {taunting = tog;}
+	void	SetTaunting(bool is_taunting);
 	bool	IsTaunting() const { return taunting; }
 	void	PickPocket(Client* thief);
 	void	Disarm(Client* client, int chance);