diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index c6eb1fa24f..30485a836c 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -1348,14 +1348,34 @@ FindNextCoreFvHandle (
     //
     FvHob = (EFI_HOB_FIRMWARE_VOLUME *)GetFirstHob (EFI_HOB_TYPE_FV);
     while (FvHob != NULL) {
+      //
+      // Search whether FvHob has been installed into PeiCore's FV database.
+      // If found, no need install new FvInfoPpi for it.
+      //
       for (Index = 0, Match = FALSE; Index < Private->FvCount; Index++) {
         if ((EFI_PEI_FV_HANDLE)(UINTN)FvHob->BaseAddress == Private->Fv[Index].FvHeader) {
           Match = TRUE;
           break;
         }
       }
+      
       //
-      // If Not Found, Install FvInfo Ppi for it.
+      // Search whether FvHob has been cached into PeiCore's Unknown FV database.
+      // If found, no need install new FvInfoPpi for it.
+      //
+      if (!Match) {
+        for (Index = 0; Index < Private->UnknownFvInfoCount; Index ++) {
+          if ((UINTN)FvHob->BaseAddress == (UINTN)Private->UnknownFvInfo[Index].FvInfo) {
+            Match = TRUE;
+            break;
+          }
+        }
+      }
+
+      //
+      // If the Fv in FvHob has not been installed into PeiCore's FV database and has
+      // not been cached into PeiCore's Unknown FV database, install a new FvInfoPpi
+      // for it then PeiCore will dispatch it in callback of FvInfoPpi.
       //
       if (!Match) {
         PeiServicesInstallFvInfoPpi (
@@ -1366,6 +1386,7 @@ FindNextCoreFvHandle (
           NULL
           );
       }
+      
       FvHob = (EFI_HOB_FIRMWARE_VOLUME *)GetNextHob (EFI_HOB_TYPE_FV, (VOID *)((UINTN)FvHob + FvHob->Header.HobLength)); 
     }
   }