diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index b931b79bfb..079e798333 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -577,6 +577,11 @@ Returns:
               //
               PrivateInMem->PeiMemoryInstalled     = TRUE;
 
+              //
+              // Restart scan of all PEIMs on next pass
+              //
+              PrivateInMem->CurrentPeimCount = 0;
+
               //
               // Shadow PEI Core. When permanent memory is avaiable, shadow
               // PEI Core and PEIMs to get high performance.