diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index d17ce5b7ee..ab06311965 100644
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -303,6 +303,8 @@ FatSetFileInfo (
   UINT8          NewAttribute;
   BOOLEAN        ReadOnly;
 
+  TempDirEnt = NULL;
+
   ZeroMem (&ZeroTime, sizeof (EFI_TIME));
   Parent = OFile->Parent;
   DirEnt = OFile->DirEnt;
diff --git a/FatPkg/FatPei/FatLiteApi.c b/FatPkg/FatPei/FatLiteApi.c
index b89ab7009d..49214a21b4 100644
--- a/FatPkg/FatPei/FatLiteApi.c
+++ b/FatPkg/FatPei/FatLiteApi.c
@@ -426,6 +426,8 @@ GetRecoveryCapsuleInfo (
   PEI_FILE_HANDLE       Handle;
   UINTN                 NumberRecoveryCapsules;
 
+  Handle = NULL;
+
   Status = GetNumberRecoveryCapsules (PeiServices, This, &NumberRecoveryCapsules);
 
   if (EFI_ERROR (Status)) {
@@ -551,6 +553,8 @@ LoadRecoveryCapsule (
   PEI_FILE_HANDLE       Handle;
   UINTN                 NumberRecoveryCapsules;
 
+  Handle = NULL;
+
   Status = GetNumberRecoveryCapsules (PeiServices, This, &NumberRecoveryCapsules);
 
   if (EFI_ERROR (Status)) {