diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index fc6f6b4414..5d4fbbc082 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -740,8 +740,14 @@ SetWorker (
   //
   ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);
 
-  if ((!PtrType) && (*Size != DxePcdGetSize (TokenNumber + 1))) {
-    return EFI_INVALID_PARAMETER;
+  if (PtrType) {
+    if (*Size > DxePcdGetSize (TokenNumber + 1)) {
+      return EFI_INVALID_PARAMETER;
+    }
+  } else {
+    if (*Size != DxePcdGetSize (TokenNumber + 1)) {
+      return EFI_INVALID_PARAMETER;
+    }
   }
 
   //
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 66e72f75e7..4f1511f427 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_NOT_FOUND If the PCD Entry is not found according to Token Number and GUID space.
   @retval EFI_OUT_OF_RESOURCES If the callback function can't be registered because there is not free
                                 slot left in the CallbackFnTable.
+  @retval EFI_INVALID_PARAMETER If the callback function want to be de-registered can not be found.
 **/
 EFI_STATUS
 PeiRegisterCallBackWorker (
@@ -100,7 +101,7 @@ PeiRegisterCallBackWorker (
     }
   }
 
-  return Register? EFI_OUT_OF_RESOURCES : EFI_NOT_FOUND;
+  return Register? EFI_OUT_OF_RESOURCES : EFI_INVALID_PARAMETER;
 
 }
 
@@ -384,8 +385,14 @@ SetWorker (
 
   LocalTokenNumber = PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber];
 
-  if ((!PtrType) && (PeiPcdGetSize(TokenNumber + 1) != *Size)) {
-    return EFI_INVALID_PARAMETER;
+  if (PtrType) {
+    if (*Size > PeiPcdGetSize (TokenNumber + 1)) {
+      return EFI_INVALID_PARAMETER;
+    }
+  } else {
+    if (*Size != PeiPcdGetSize (TokenNumber + 1)) {
+      return EFI_INVALID_PARAMETER;
+    }
   }
 
   //