diff --git a/Categories/Status.lua b/Categories/Status.lua
index 163248d..3e8251d 100644
--- a/Categories/Status.lua
+++ b/Categories/Status.lua
@@ -40,6 +40,10 @@ end
 
 -- Parnic: pet happiness removed in 4.1
 local wow_401 = wow_ver >= 40100
+-- ...and back in Classic
+if wow_classic then
+	petHappinessEvent = "UNIT_HAPPINESS"
+end
 
 -- Parnic: GetNumRaidMembers/GetNumPartyMembers removed in 6.0
 if wow_600 or wow_classic then
@@ -453,7 +457,7 @@ DogTag:AddTag("Unit", "IsFeignedDeath", {
 })
 
 -- Parnic: pet happiness removed in 4.1
-if not wow_401 then
+if not wow_401 and not wow_classic then
 DogTag:AddTag("Unit", "HappyNum", {
 	code = function()
 		return GetPetHappiness() or 0
@@ -931,7 +935,7 @@ DogTag:AddTag("Unit", "StatusColor", {
 })
 
 -- Parnic: pet happiness removed in 4.1
-if not wow_401 then
+if not wow_401 and not wow_classic then
 DogTag:AddTag("Unit", "HappyColor", {
 	code = function(value)
 		local x = GetPetHappiness()