diff --git a/MdeModulePkg/Include/WorkingBlockHeader.h b/MdeModulePkg/Include/WorkingBlockHeader.h
index e5a4e204a5..1158e9a2c7 100644
--- a/MdeModulePkg/Include/WorkingBlockHeader.h
+++ b/MdeModulePkg/Include/WorkingBlockHeader.h
@@ -29,7 +29,7 @@ typedef struct {
 #define WORKING_BLOCK_INVALID 0x2
   UINT8     Reserved : 6;
   UINT8     Reserved3[3];
-  UINT32    WriteQueueSize;
+  UINT64    WriteQueueSize;
   //
   // UINT8                WriteQueue[WriteQueueSize];
   //
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index edd69ad173..b00fe77efd 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -93,9 +93,9 @@ DATA = {
   0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
   0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
-  0x85, 0xae, 0x2d, 0xbf, 0xFE, 0xFF, 0xFF, 0xFF,
-  # WriteQueueSize: UINT32
-  0xE4, 0x1F, 0x00, 0x00
+  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,
+  # WriteQueueSize: UINT64
+  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
 0x00290000|0x00010000