diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 06df161e5d..34b79305c8 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -1337,6 +1337,10 @@ Returns:
     return EFI_INVALID_PARAMETER;
   }
 
+  if (VariableName[0] == 0) {
+    return EFI_NOT_FOUND;
+  }
+
   //
   // Find existing variable
   //