diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 53a1baf36..ee47d7be4 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -220,7 +220,7 @@ namespace Game.Entities
 
             m_creatureInfo = creatureInfo;
             SetEntry(entry);
-            m_creatureDifficulty = creatureInfo.GetDifficulty(GetMap().GetDifficultyID());
+            m_creatureDifficulty = creatureInfo.GetDifficulty(!IsPet() ? GetMap().GetDifficultyID() : Difficulty.None);
 
             // equal to player Race field, but creature does not have race
             SetRace(0);
diff --git a/Source/Game/Entities/Pet.cs b/Source/Game/Entities/Pet.cs
index d7a50a912..dea1074c8 100644
--- a/Source/Game/Entities/Pet.cs
+++ b/Source/Game/Entities/Pet.cs
@@ -162,7 +162,11 @@ namespace Game.Entities
             if (petInfo.Type == PetType.Hunter)
             {
                 CreatureTemplate creatureInfo = Global.ObjectMgr.GetCreatureTemplate(petInfo.CreatureId);
-                if (creatureInfo == null || !creatureInfo.IsTameable(owner.CanTameExoticPets(), GetCreatureDifficulty()))
+                if (creatureInfo == null)
+                    return false;
+
+                CreatureDifficulty creatureDifficulty = creatureInfo.GetDifficulty(Difficulty.None);
+                if (creatureDifficulty == null || !creatureInfo.IsTameable(owner.CanTameExoticPets(), creatureDifficulty))
                     return false;
             }