diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index bb9514c315..fc8bae2317 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -982,6 +982,17 @@ SetupBrowser (
           default:
             break;
           }
+        } else if (Status != EFI_UNSUPPORTED) {
+          //
+          // Callback return error status other than EFI_UNSUPPORTED
+          //
+          if (Statement->Operand == EFI_IFR_REF_OP) {
+            //
+            // Cross reference will not be taken
+            //
+            Selection->FormId = Selection->Form->FormId;
+            Selection->QuestionId = 0;
+          }
         }
       }