diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index df73b7b3a1..ba197fd7f9 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1537,7 +1537,7 @@ InternalHiiValidateCurrentSetting (
           //
           // OneOf value doesn't belong to one of option value. 
           //
-          if (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP) {
+          if ((VarBlockData.Scope == 0) && (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP)) {
             Status = EFI_INVALID_PARAMETER;
             goto Done;
           }