diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index d7536e7ba5..1f8da4237e 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2141,6 +2141,10 @@ SendDiscardInfoToDriver (
       continue;
     }
 
+    if ((Question->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) {
+      continue;
+    }
+
     if (Question->Operand == EFI_IFR_PASSWORD_OP) {
       continue;
     }