diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
index 23079db0c41..04ce128d592 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
@@ -3966,7 +3966,7 @@ void CraftingOrderData::WriteCreate(ByteBuffer& data, Player const* owner, Playe
     data << int32(Field_0);
     data << uint64(OrderID);
     data << int32(SkillLineAbilityID);
-    data << uint8(OrderState);
+    data << int32(OrderState);
     data << uint8(OrderType);
     data << uint8(MinQuality);
     data << int64(ExpirationTime);
@@ -4054,7 +4054,7 @@ void CraftingOrderData::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Pl
         }
         if (changesMask[5])
         {
-            data << uint8(OrderState);
+            data << int32(OrderState);
         }
     }
     if (changesMask[6])
@@ -5726,6 +5726,10 @@ void ActivePlayerData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bo
                 }
             }
         }
+    }
+    data.FlushBits();
+    if (changesMask[32])
+    {
         if (changesMask[41])
         {
             if (!ignoreNestedChangesMask)
@@ -5734,6 +5738,7 @@ void ActivePlayerData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bo
                 WriteCompleteDynamicFieldUpdateMask(AccountBankTabSettings.size(), data, 3);
         }
     }
+    data.FlushBits();
     if (changesMask[0])
     {
         if (changesMask[10])
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index f14700d4940..6635950cc62 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -869,7 +869,7 @@ struct CraftingOrderData : public IsUpdateFieldStructureTag, public HasChangesMa
     UpdateField<int32, 0, 2> Field_0;
     UpdateField<uint64, 0, 3> OrderID;
     UpdateField<int32, 0, 4> SkillLineAbilityID;
-    UpdateField<uint8, 0, 5> OrderState;
+    UpdateField<int32, 0, 5> OrderState;
     UpdateField<uint8, 6, 7> OrderType;
     UpdateField<uint8, 6, 8> MinQuality;
     UpdateField<int64, 6, 9> ExpirationTime;