diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c
index ac31fafbdc..e58e75eb22 100644
--- a/OvmfPkg/PlatformDxe/Platform.c
+++ b/OvmfPkg/PlatformDxe/Platform.c
@@ -258,7 +258,7 @@ ExtractConfig (
       !HiiIsConfigHdrMatch (
          Request,
          &gOvmfPlatformConfigGuid,
-         mVariableName
+         mHiiFormName
          )
       )
   {
@@ -447,7 +447,7 @@ RouteConfig (
       !HiiIsConfigHdrMatch (
          Configuration,
          &gOvmfPlatformConfigGuid,
-         mVariableName
+         mHiiFormName
          )
       )
   {
diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c
index f5ac2d0609..4058a324eb 100644
--- a/OvmfPkg/PlatformDxe/PlatformConfig.c
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.c
@@ -22,6 +22,7 @@
 // Name of the UEFI variable that we use for persistent storage.
 //
 CHAR16  mVariableName[] = L"PlatformConfig";
+CHAR16  mHiiFormName[]  = L"MainFormState";
 
 /**
   Serialize and persistently save platform configuration.
diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h
index 5d9b457b1b..93d06a9a6b 100644
--- a/OvmfPkg/PlatformDxe/PlatformConfig.h
+++ b/OvmfPkg/PlatformDxe/PlatformConfig.h
@@ -51,5 +51,6 @@ PlatformConfigLoad (
 #define PLATFORM_CONFIG_F_DOWNGRADE            BIT63
 
 extern CHAR16  mVariableName[];
+extern CHAR16  mHiiFormName[];
 
 #endif // _PLATFORM_CONFIG_H_