diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 0adb66b032..bf389bbbe7 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -75,9 +75,6 @@
   gEfiSecPlatformInformation2PpiGuid            ## UNDEFINED # HOB
   gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB
 
-[Pcd]
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber    ## CONSUMES
-
 [Depex]
   TRUE
 
diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c
index efab78c83d..f3362613aa 100644
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/UefiCpuPkg/CpuDxe/CpuMp.c
@@ -613,22 +613,14 @@ InitializeMpSupport (
   UINTN          NumberOfProcessors;
   UINTN          NumberOfEnabledProcessors;
 
-  NumberOfProcessors = (UINTN) PcdGet32 (PcdCpuMaxLogicalProcessorNumber);
-  if (NumberOfProcessors < 1) {
-    DEBUG ((DEBUG_ERROR, "Setting PcdCpuMaxLogicalProcessorNumber should be more than zero.\n"));
-    return;
-  }
-
   //
-  // Only perform AP detection if PcdCpuMaxLogicalProcessorNumber is greater than 1
+  // Wakeup APs to do initialization
   //
-  if (NumberOfProcessors > 1) {
-    Status = MpInitLibInitialize ();
-    ASSERT_EFI_ERROR (Status);
+  Status = MpInitLibInitialize ();
+  ASSERT_EFI_ERROR (Status);
 
-    MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors);
-    mNumberOfProcessors = NumberOfProcessors;
-  }
+  MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors);
+  mNumberOfProcessors = NumberOfProcessors;
   DEBUG ((EFI_D_ERROR, "Detect CPU count: %d\n", mNumberOfProcessors));
 
   //