diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionWagTail.java b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionWagTail.java
index 9109e328..a1df91ff 100644
--- a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionWagTail.java
+++ b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionWagTail.java
@@ -22,8 +22,13 @@ public class ActionWagTail extends PetAction {
     public boolean apply(Pet pet, Habbo habbo, String[] data) {
         pet.clearPosture();
         Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.WAG_TAIL, null, false), this.minimumActionDuration);
-        pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
-        return true;
 
+        if (pet.getHappyness() > 50) {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.PLAYFUL));
+        } else {
+            pet.say(pet.getPetData().randomVocal(PetVocalsType.GENERIC_NEUTRAL));
+        }
+
+        return true;
     }
 }