diff --git a/Source/Game/BattlePets/BattlePetManager.cs b/Source/Game/BattlePets/BattlePetManager.cs
index f7ea08268..43451ead5 100644
--- a/Source/Game/BattlePets/BattlePetManager.cs
+++ b/Source/Game/BattlePets/BattlePetManager.cs
@@ -689,17 +689,6 @@ namespace Game.BattlePets
             List<BattlePet> updates = new();
             updates.Add(pet);
             SendUpdates(updates, false);
-
-            // Update battle pet related update fields
-            Creature summonedBattlePet = player.GetSummonedBattlePet();
-            if (summonedBattlePet != null)
-            {
-                if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
-                {
-                    summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
-                    player.SetBattlePetData(pet);
-                }
-            }
         }
 
         public void GrantBattlePetLevel(ObjectGuid guid, ushort grantedLevels)
@@ -720,14 +709,12 @@ namespace Game.BattlePets
             if (level >= SharedConst.MaxBattlePetLevel)
                 return;
 
-            Player player = _owner.GetPlayer();
-
             while (grantedLevels > 0 && level < SharedConst.MaxBattlePetLevel)
             {
                 ++level;
                 --grantedLevels;
 
-                player.UpdateCriteria(CriteriaType.BattlePetReachLevel, pet.PacketInfo.Species, level);
+                _owner.GetPlayer().UpdateCriteria(CriteriaType.BattlePetReachLevel, pet.PacketInfo.Species, level);
             }
 
             pet.PacketInfo.Level = level;
@@ -742,17 +729,6 @@ namespace Game.BattlePets
             List<BattlePet> updates = new List<BattlePet>();
             updates.Add(pet);
             SendUpdates(updates, false);
-
-            // Update battle pet related update fields
-            Creature summonedBattlePet = player.GetSummonedBattlePet();
-            if (summonedBattlePet != null)
-            {
-                if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
-                {
-                    summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
-                    player.SetBattlePetData(pet);
-                }
-            }
         }
 
         public void HealBattlePetsPct(byte pct)
@@ -777,6 +753,26 @@ namespace Game.BattlePets
             SendUpdates(updates, false);
         }
 
+        public void UpdateBattlePetData(ObjectGuid guid)
+        {
+            BattlePet pet = GetPet(guid);
+            if (pet == null)
+                return;
+
+            Player player = _owner.GetPlayer();
+
+            // Update battle pet related update fields
+            Creature summonedBattlePet = player.GetSummonedBattlePet();
+            if (summonedBattlePet != null)
+            {
+                if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
+                {
+                    summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
+                    player.SetBattlePetData(pet);
+                }
+            }
+        }
+
         public void SummonPet(ObjectGuid guid)
         {
             BattlePet pet = GetPet(guid);
diff --git a/Source/Game/Handlers/BattlePetHandler.cs b/Source/Game/Handlers/BattlePetHandler.cs
index c2a75ba30..f38ce37c2 100644
--- a/Source/Game/Handlers/BattlePetHandler.cs
+++ b/Source/Game/Handlers/BattlePetHandler.cs
@@ -146,5 +146,11 @@ namespace Game
             else
                 GetBattlePetMgr().DismissPet();
         }
+
+        [WorldPacketHandler(ClientOpcodes.BattlePetUpdateNotify)]
+        void HandleBattlePetUpdateNotify(BattlePetUpdateNotify battlePetUpdateNotify)
+        {
+            GetBattlePetMgr().UpdateBattlePetData(battlePetUpdateNotify.PetGuid);
+        }
     }
 }
diff --git a/Source/Game/Networking/Packets/BattlePetPackets.cs b/Source/Game/Networking/Packets/BattlePetPackets.cs
index a72bbc435..93f49cc9b 100644
--- a/Source/Game/Networking/Packets/BattlePetPackets.cs
+++ b/Source/Game/Networking/Packets/BattlePetPackets.cs
@@ -301,7 +301,18 @@ namespace Game.Networking.Packets
         public ObjectGuid PetGuid;
     }
 
+    class BattlePetUpdateNotify : ClientPacket
+    {
+        public ObjectGuid PetGuid;
 
+        public BattlePetUpdateNotify(WorldPacket packet) : base(packet) { }
+
+        public override void Read()
+        {
+            PetGuid = _worldPacket.ReadPackedGuid();
+        }
+    }
+    
     //Structs
     public struct BattlePetStruct
     {