diff --git a/Source/Game/BattlePets/BattlePetManager.cs b/Source/Game/BattlePets/BattlePetManager.cs
index 485baa5f3..9f89ba25d 100644
--- a/Source/Game/BattlePets/BattlePetManager.cs
+++ b/Source/Game/BattlePets/BattlePetManager.cs
@@ -399,7 +399,7 @@ namespace Game.BattlePets
                 return;
 
             pet.PacketInfo.Name = name;
-            pet.NameTimestamp = !pet.PacketInfo.Name.IsEmpty() ? GameTime.GetGameTime() : 0;
+            pet.NameTimestamp = GameTime.GetGameTime();
 
             pet.DeclinedName = new DeclinedName();
             if (declinedName != null)
diff --git a/Source/Game/Handlers/BattlePetHandler.cs b/Source/Game/Handlers/BattlePetHandler.cs
index 23ca2e7c5..078201e56 100644
--- a/Source/Game/Handlers/BattlePetHandler.cs
+++ b/Source/Game/Handlers/BattlePetHandler.cs
@@ -20,6 +20,7 @@ using Game.BattlePets;
 using Game.Entities;
 using Game.Networking;
 using Game.Networking.Packets;
+using System;
 
 namespace Game
 {
@@ -88,7 +89,6 @@ namespace Game
                 return;
             }
 
-            response.Allow = true;
             response.Name = battlePet.PacketInfo.Name;
             if (battlePet.DeclinedName != null)
             {
@@ -96,6 +96,8 @@ namespace Game
                 response.DeclinedNames = battlePet.DeclinedName;
             }
 
+            response.Allow = !response.Name.IsEmpty();
+
             SendPacket(response);
         }