diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 4ba0cb0903..68bb0bbf6e 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2262,6 +2262,11 @@ SendDiscardInfoToDriver (
       continue;
     }
 
+    //
+    // Restore the question value before call the CHANGED callback type.
+    //
+    GetQuestionValue (FormSet, Form, Question, GetSetValueWithEditBuffer);
+
     if (Question->HiiValue.Type == EFI_IFR_TYPE_BUFFER) {
       TypeValue = (EFI_IFR_TYPE_VALUE *) Question->BufferValue;
     } else {