2 files changed, 4 insertions, 11 deletions
diff --git a/src/server/game/Server/Packets/HotfixPackets.cpp b/src/server/game/Server/Packets/HotfixPackets.cpp
index 629627ff852..43407e53a25 100644
--- a/src/server/game/Server/Packets/HotfixPackets.cpp
+++ b/src/server/game/Server/Packets/HotfixPackets.cpp
@@ -17,6 +17,7 @@
 
 #include "HotfixPackets.h"
 #include "PacketUtilities.h"
+#include "Util.h"
 
 namespace WorldPackets
 {
@@ -88,16 +89,8 @@ void HotfixRequest::Read()
 ByteBuffer& operator<<(ByteBuffer& data, HotfixConnect::HotfixData const& hotfixData)
 {
     data << hotfixData.Record;
-    if (hotfixData.Size)
-    {
-        data << uint32(*hotfixData.Size);
-        data.WriteBits(1, 2);
-    }
-    else
-    {
-        data << uint32(0);
-        data.WriteBits(3, 2);
-    }
+    data << uint32(hotfixData.Size);
+    data.WriteBits(AsUnderlyingType(hotfixData.Record.HotfixStatus), 2);
     data.FlushBits();
 
     return data;
diff --git a/src/server/game/Server/Packets/HotfixPackets.h b/src/server/game/Server/Packets/HotfixPackets.h
index ecd48021203..bf32fa2899d 100644
--- a/src/server/game/Server/Packets/HotfixPackets.h
+++ b/src/server/game/Server/Packets/HotfixPackets.h
@@ -89,7 +89,7 @@ namespace WorldPackets
             struct HotfixData
             {
                 DB2Manager::HotfixRecord Record;
-                Optional<uint32> Size;
+                uint32 Size = 0;
             };
 
             HotfixConnect() : ServerPacket(SMSG_HOTFIX_CONNECT) { }