diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index a24c59bdce..3ee8b4ca34 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -2320,6 +2320,11 @@ AddPackages (
   EFI_HII_PACKAGE_HEADER               PackageHeader;
   UINT32                               OldPackageListLen;
 
+  //
+  // Initialize Variables
+  //
+  FontPackage = NULL;
+
   //
   // Process the package list header
   //