diff --git a/UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index 1ed589a6a2..8c4136609d 100644
--- a/UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -47,6 +47,7 @@ AcpiTimerLibConstructor (
   pAcpiBoardInfo = (ACPI_BOARD_INFO *)GET_GUID_HOB_DATA (GuidHob);
 
   mPmTimerReg = (UINTN)pAcpiBoardInfo->PmTimerRegBase;
+  ASSERT (pAcpiBoardInfo->PmTimerRegBase != 0);
 
   return EFI_SUCCESS;
 }
diff --git a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
index 1f2882069f..f252855cfb 100644
--- a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -40,6 +40,12 @@ ResetSystemLibConstructor (
   AcpiBoardInfoPtr = (ACPI_BOARD_INFO *)GET_GUID_HOB_DATA (GuidHob);
   CopyMem (&mAcpiBoardInfo, AcpiBoardInfoPtr, sizeof (ACPI_BOARD_INFO));
 
+  ASSERT (mAcpiBoardInfo.ResetRegAddress != 0);
+  ASSERT (mAcpiBoardInfo.ResetValue != 0);
+  ASSERT (mAcpiBoardInfo.PmGpeEnBase != 0);
+  ASSERT (mAcpiBoardInfo.PmEvtBase != 0);
+  ASSERT (mAcpiBoardInfo.PmCtrlRegBase != 0);
+
   return EFI_SUCCESS;
 }
 
diff --git a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c
index 8e3032b440..a7ee00f3e9 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/AcpiTable.c
@@ -125,15 +125,6 @@ Done:
   DEBUG ((DEBUG_INFO, "PcieBaseAddr 0x%lx\n", AcpiBoardInfo->PcieBaseAddress));
   DEBUG ((DEBUG_INFO, "PcieBaseSize 0x%lx\n", AcpiBoardInfo->PcieBaseSize));
 
-  //
-  // Verify values for proper operation
-  //
-  // ASSERT (Fadt->Pm1aCntBlk != 0);
-  // ASSERT (Fadt->PmTmrBlk != 0);
-  // ASSERT (Fadt->ResetReg.Address != 0);
-  // ASSERT (Fadt->Pm1aEvtBlk != 0);
-  // ASSERT (Fadt->Gpe0Blk != 0);
-
   return RETURN_SUCCESS;
 }