diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index e816c608e7..0be75a3fdf 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -100,6 +100,14 @@ config BT_NIMBLE_L2CAP_COC_MAX_NUM
     help
         Defines maximum number of BLE Connection Oriented Channels. When set to (0), BLE COC is not compiled in
 
+config BT_NIMBLE_L2CAP_ENHANCED_COC
+    bool "L2CAP Enhanced Connection Oriented Channel"
+    depends on BT_NIMBLE_ENABLED && (BT_NIMBLE_L2CAP_COC_MAX_NUM >= 1)
+    default 0
+    help
+        Enable Enhanced Credit Based Flow Control Mode
+
+
 choice BT_NIMBLE_PINNED_TO_CORE_CHOICE
     prompt "The CPU core on which NimBLE host will run"
     depends on BT_NIMBLE_ENABLED && !FREERTOS_UNICORE
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
index d2bf375c49..836f54a8ae 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -511,6 +511,18 @@
 #define MYNEWT_VAL_BLE_L2CAP_COC_SDU_BUFF_COUNT CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT
 #endif
 
+#if CONFIG_BT_NIMBLE_L2CAP_ENHANCED_COC
+#ifndef MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC
+#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (CONFIG_BT_NIMBLE_L2CAP_ENHANCED_COC)
+#else
+#if CONFIG_BT_NIMBLE_EATT_CHAN_NUM
+#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (1)
+#else
+#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (0)
+#endif
+#endif
+#endif
+
 #ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE
 #ifdef CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
 #define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
@@ -818,11 +830,6 @@
 #define MYNEWT_VAL_BLE_L2CAP_COC_MPS (MYNEWT_VAL_MSYS_1_BLOCK_SIZE-8)
 #endif
 
-#if CONFIG_BT_NIMBLE_EATT_CHAN_NUM
-#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (1)
-#else
-#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (0)
-#endif
 
 #ifndef MYNEWT_VAL_BLE_L2CAP_JOIN_RX_FRAGS
 #define MYNEWT_VAL_BLE_L2CAP_JOIN_RX_FRAGS (1)