diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 2cda7ff3ad..d5881f5ce8 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -379,7 +379,7 @@ FindVariable (
   UINT32                  Count;
   UINT8                   *VariableBase;
 
-  if (VariableName != 0 && VendorGuid == NULL) {
+  if (VariableName[0] != 0 && VendorGuid == NULL) {
     return EFI_INVALID_PARAMETER;
   }
   //
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index d778fde073..471b6a4749 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -367,7 +367,7 @@ FindVariable (
   UINT32                  Count;
   UINT8                   *VariableBase;
 
-  if (VariableName != NULL && VendorGuid == NULL) {
+  if (VariableName[0] != 0 && VendorGuid == NULL) {
     return EFI_INVALID_PARAMETER;
   }
   //