diff --git a/device/esp_tinyusb/CHANGELOG.md b/device/esp_tinyusb/CHANGELOG.md
index 2566facd..28980f22 100644
--- a/device/esp_tinyusb/CHANGELOG.md
+++ b/device/esp_tinyusb/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 1.4.3~1 (Unreleased)
 
 - CDC-ACM: Remove MIN() definition if already defined
+- MSC: Set EP size in configuration descriptor based on speed
 
 ## 1.4.3
 
diff --git a/device/esp_tinyusb/usb_descriptors.c b/device/esp_tinyusb/usb_descriptors.c
index 1c6e1ce5..956cc0fb 100644
--- a/device/esp_tinyusb/usb_descriptors.c
+++ b/device/esp_tinyusb/usb_descriptors.c
@@ -182,7 +182,7 @@ uint8_t const descriptor_cfg_kconfig[] = {
 
 #if CFG_TUD_MSC
     // Interface number, string index, EP Out & EP In address, EP size
-    TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, STRID_MSC_INTERFACE, EPNUM_MSC, 0x80 | EPNUM_MSC, 64), // highspeed 512
+    TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, STRID_MSC_INTERFACE, EPNUM_MSC, 0x80 | EPNUM_MSC, TUD_OPT_HIGH_SPEED ? 512 : 64),
 #endif
 
 #if CFG_TUD_NCM