diff --git a/api/unitframes.lua b/api/unitframes.lua
index 9a33b9f7..326e3601 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -1411,7 +1411,8 @@ function pfUI.uf:RefreshIndicators(unit)
   end
 
   if unit.happinessIcon and unit:GetName() == "pfPet" then -- Happiness Icon
-    if unit.config.happinessicon == "0" then
+    local _, pclass = UnitClass("player")
+    if unit.config.happinessicon == "0" or pclass ~= "HUNTER" then
       unit.happinessIcon:Hide()
     else
       if UnitIsVisible("pet") then