diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
index 413505648c..18a677577d 100644
--- a/src/portable/synopsys/dwc2/dcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -630,26 +630,36 @@ void dcd_sof_enable(uint8_t rhport, bool en)
 /* DCD Endpoint port
  *------------------------------------------------------------------*/
 
-// Check is IN/OUT endpoint is avaliable before opening it
-static bool dcd_edpt_check_if_avaliable(uint8_t rhport, uint8_t direction)
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
+
+// Check if IN/OUT endpoint is avaliable before opening it
+static bool dcd_ep_available(uint8_t rhport, uint8_t dir) 
 {
-  if (direction) {  // IN direction
-    if (ep_avaliable_count[rhport].in_ep < 1) {
-      TU_LOG(1, "Trying to open IN endpoint, but max number of IN endpoints already opened on this target \r\n");
-      return false;
+    // Verify that we have a vacant EP
+    if ((dwc_ep_config[rhport].in_ep + dwc_ep_config[rhport].out_ep) > (dwc_ep_config[rhport].ep_max_count - 1)) {
+        TU_LOG(1, "Trying to open an endpoint, but max number of endpoints: %d already opened on this target \r\n", dwc_ep_config[rhport].ep_max_count);
+        return false;
     }
-  } else {        // OUT direction
-    if (ep_avaliable_count[rhport].out_ep < 1) {
-      TU_LOG(1, "Trying to open OUT endpoint, but max number of OUT endpoints already opened on this target \r\n");
-      return false;
+    // Get the ep_count amount at the moment as a temporal variable and update it
+    uint8_t new_ep_count = (dir) ? dwc_ep_config[rhport].in_ep : dwc_ep_config[rhport].out_ep;
+
+    // Verify overflow for IN EP ESP32Sx
+ #if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+     // ESP32Sx has 6 endpoints, from which only 5 can be confiugred as IN
+     if ((dir) && (new_ep_count > (dwc_ep_config[rhport].ep_max_count - 1))) {
+         TU_LOG(1, "Trying to open IN endpoint, but max number of IN endpoints: %d already opened on this target \r\n", dwc_ep_config[rhport].ep_max_count - 1);
+         return false;
+     }
+ #endif // TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+    // Write new value back
+    if(dir) {
+        dwc_ep_config[rhport].in_ep = new_ep_count;
+    } else {
+        dwc_ep_config[rhport].out_ep = new_ep_count;
     }
-  }
-
-  ep_avaliable_count[rhport].in_ep--;
-  ep_avaliable_count[rhport].out_ep--;
-
-  return true;
+    return true; 
 }
+#endif // TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
 
 bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
 {
@@ -661,7 +671,11 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
   uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress);
   uint8_t const dir   = tu_edpt_dir(desc_edpt->bEndpointAddress);
 
-  TU_ASSERT(dcd_edpt_check_if_avaliable(rhport, dir));
+  #if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
+  if (!dcd_ep_available(rhport, dir)) {
+    return false;
+  }
+  #endif
 
   xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
   xfer->max_size = tu_edpt_packet_size(desc_edpt);
@@ -742,6 +756,11 @@ void dcd_edpt_close_all (uint8_t rhport)
   dwc2_regs_t * dwc2     = DWC2_REG(rhport);
   uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
 
+  #if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
+  dwc_ep_config[rhport].in_ep = 0;
+  dwc_ep_config[rhport].out_ep = 0;
+  #endif
+
   // Disable non-control interrupt
   dwc2->daintmsk = (1 << DAINTMSK_OEPM_Pos) | (1 << DAINTMSK_IEPM_Pos);
 
@@ -899,6 +918,14 @@ void dcd_edpt_close (uint8_t rhport, uint8_t ep_addr)
 
   dcd_edpt_disable(rhport, ep_addr, false);
 
+  #if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
+  if (dir) {
+    dwc_ep_config[rhport].in_ep--;
+  } else {
+    dwc_ep_config[rhport].out_ep--;
+  }
+  #endif
+
   // Update max_size
   xfer_status[epnum][dir].max_size = 0;  // max_size = 0 marks a disabled EP - required for changing FIFO allocation
 
diff --git a/src/portable/synopsys/dwc2/dwc2_esp32.h b/src/portable/synopsys/dwc2/dwc2_esp32.h
index 8f94cb4cc4..695a4ff53f 100644
--- a/src/portable/synopsys/dwc2/dwc2_esp32.h
+++ b/src/portable/synopsys/dwc2/dwc2_esp32.h
@@ -82,19 +82,13 @@ static const dwc2_controller_t _dwc2_controller[] =
 #endif
 };
 
-static ep_avaliable_count_t ep_avaliable_count[] =
+static dwc_ep_config_t dwc_ep_config[] = 
 {
 #ifdef DWC2_FS_PERIPH_BASE
-// ESP32Sx has 6 endpoints, from which only 5 can be confiugred as IN
-#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
-  { .out_ep = DWC2_FS_EP_MAX, .in_ep = DWC2_FS_EP_MAX - 1},
-#else
-  { .out_ep = DWC2_FS_EP_MAX, .in_ep = DWC2_FS_EP_MAX},
-#endif
+  { .out_ep = 0, .in_ep = 0, .ep_max_count = DWC2_FS_EP_MAX },
 #endif
-
 #ifdef DWC2_HS_PERIPH_BASE
-  { .out_ep = DWC2_HS_EP_MAX, .in_ep = DWC2_HS_EP_MAX},
+  { .out_ep = 0, .in_ep = 0, .ep_max_count = DWC2_HS_EP_MAX },
 #endif
 };
 
diff --git a/src/portable/synopsys/dwc2/dwc2_type.h b/src/portable/synopsys/dwc2/dwc2_type.h
index d87bf4e6e8..2f5783c1ec 100644
--- a/src/portable/synopsys/dwc2/dwc2_type.h
+++ b/src/portable/synopsys/dwc2/dwc2_type.h
@@ -32,11 +32,13 @@ typedef struct
   uint32_t  ep_fifo_size;
 }dwc2_controller_t;
 
-typedef struct
-{
-  int8_t out_ep;
-  int8_t in_ep;
-}ep_avaliable_count_t;
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_ESP32P4)
+typedef struct {
+    uint8_t out_ep;
+    uint8_t in_ep;
+    const uint8_t ep_max_count;
+}dwc_ep_config_t;
+#endif
 
 /* DWC OTG HW Release versions */
 #define DWC2_CORE_REV_2_71a   0x4f54271a