diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
index d72e62b6a9..64e15030c5 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
@@ -97,7 +97,7 @@ PxeBcBuildDhcp6Options (
   // Append client network device interface option
   //
   OptList[Index]->OpCode     = HTONS (PXEBC_DHCP6_OPT_UNDI);
-  OptList[Index]->OpLen      = HTONS ((UINT16) sizeof (PXEBC_DHCP6_OPTION_UNDI));
+  OptList[Index]->OpLen      = HTONS ((UINT16)3);
   OptEnt.Undi                = (PXEBC_DHCP6_OPTION_UNDI *) OptList[Index]->Data;
 
   if (Private->Nii != NULL) {
@@ -110,7 +110,6 @@ PxeBcBuildDhcp6Options (
     OptEnt.Undi->MinorVer    = DEFAULT_UNDI_MINOR;
   }
 
-  OptEnt.Undi->Reserved      = 0;
   Index++;
   OptList[Index]             = GET_NEXT_DHCP6_OPTION (OptList[Index - 1]);
 
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
index 0eccacb962..bf4839c493 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
@@ -85,7 +85,6 @@ typedef struct {
   UINT8 Type;
   UINT8 MajorVer;
   UINT8 MinorVer;
-  UINT8 Reserved;
 } PXEBC_DHCP6_OPTION_UNDI;
 
 typedef struct {