diff --git a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
index f81aa0f301..4be5d66ba5 100644
--- a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
+++ b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
@@ -194,8 +194,8 @@ GetParameterBase (
     return NULL;
   }
 
-  PcdSet64S (PcdBootloaderParameter, (UINTN)CbTablePtr);
-  ASSERT_EFI_STATUS (Status);
+  Status = PcdSet64S (PcdBootloaderParameter, (UINTN)CbTablePtr);
+  ASSERT_EFI_ERROR (Status);
 
   return CbTablePtr;
 }
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 5a1e578668..0e6dcf10f9 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -406,7 +406,9 @@ _ModuleEntryPoint (
   SERIAL_PORT_INFO              SerialPortInfo;
   UNIVERSAL_PAYLOAD_SERIAL_PORT_INFO  *UniversalSerialPort;
 
-  PcdSet64S (PcdBootloaderParameter, BootloaderParameter);
+  Status = PcdSet64S (PcdBootloaderParameter, BootloaderParameter);
+  ASSERT_EFI_ERROR (Status);
+
   // Initialize floating point operating environment to be compliant with UEFI spec.
   InitializeFloatingPointUnits ();