diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
index 11570ab36d..482a71f338 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
@@ -65,7 +65,7 @@ typedef struct {
 typedef struct {
   USB_INTERFACE_SETTING*        Settings[USB_MAX_INTERFACE_SETTING];
   UINTN                         NumOfSetting;
-  UINT8                         ActiveIndex;  // Index of active setting
+  UINTN                         ActiveIndex;  // Index of active setting
 } USB_INTERFACE_DESC;
 
 typedef struct {
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 430f5aa3dc..f4aad66baf 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -318,7 +318,7 @@ UsbSelectSetting (
   )
 {
   USB_INTERFACE_SETTING   *Setting;
-  UINT8                   Index;
+  UINTN                   Index;
 
   //
   // Locate the active alternate setting