diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 5809a0f914..8e6bc6ff64 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -932,9 +932,9 @@ XhcControlTransfer (
         }
         Xhc->UsbDevContext[SlotId].ConfDesc = AllocateZeroPool (Xhc->UsbDevContext[SlotId].DevDesc.NumConfigurations * sizeof (EFI_USB_CONFIG_DESCRIPTOR *));
         if (Xhc->HcCParams.Data.Csz == 0) {
-          Status = XhcEvaluateContext (Xhc, SlotId, MaxPacket0);
+          Status = XhcEvaluateContext (Xhc, SlotId, MaxPacket0);
         } else {
-          Status = XhcEvaluateContext64 (Xhc, SlotId, MaxPacket0);
+          Status = XhcEvaluateContext64 (Xhc, SlotId, MaxPacket0);
         }
         ASSERT_EFI_ERROR (Status);
     } else if (DescriptorType == USB_DESC_TYPE_CONFIG) {
@@ -1802,6 +1802,8 @@ XhcExitBootService (
     gBS->CloseEvent (Xhc->PollTimer);
   }
 
+  XhcClearBiosOwnership (Xhc);
+
   //
   // Restore original PCI attributes
   //
@@ -1811,8 +1813,6 @@ XhcExitBootService (
                   Xhc->OriginalPciAttributes,
                   NULL
                   );
-
-  XhcClearBiosOwnership (Xhc);
 }
 
 /**