diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index e3a7b5387b..fcdf0c6647 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -254,10 +254,11 @@ PeCoffLoaderGetImageInfo (
   ImageContext->DestinationAddress = 0;
 
   //
-  // Initialize the codeview pointer.
+  // Initialize the debug codeview pointer.
   //
-  ImageContext->CodeView    = NULL;
-  ImageContext->PdbPointer  = NULL;
+  ImageContext->DebugDirectoryEntryRva = 0;
+  ImageContext->CodeView               = NULL;
+  ImageContext->PdbPointer             = NULL;
 
   //
   // Three cases with regards to relocations: