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 54edc4d90f..11d6f34148 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -515,17 +515,11 @@
 #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
+#if CONFIG_BT_NIMBLE_L2CAP_ENHANCED_COC || 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
@@ -834,7 +828,6 @@
 #define MYNEWT_VAL_BLE_L2CAP_COC_MPS (MYNEWT_VAL_MSYS_1_BLOCK_SIZE-8)
 #endif
 
-
 #ifndef MYNEWT_VAL_BLE_L2CAP_JOIN_RX_FRAGS
 #define MYNEWT_VAL_BLE_L2CAP_JOIN_RX_FRAGS (1)
 #endif
@@ -847,13 +840,13 @@
 #define MYNEWT_VAL_BLE_L2CAP_RX_FRAG_TIMEOUT (30000)
 #endif
 
-#ifndef MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS
-#ifdef CONFIG_BT_NIMBLE_EATT_CHAN_NUM
+#if CONFIG_BT_NIMBLE_EATT_CHAN_NUM > CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM
 #define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (CONFIG_BT_NIMBLE_EATT_CHAN_NUM)
+#elif CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM
+#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM)
 #else
 #define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
 #endif
-#endif
 
 #ifndef MYNEWT_VAL_BLE_MESH
 #ifdef CONFIG_BT_NIMBLE_MESH
@@ -965,11 +958,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
-#ifdef CONFIG_BT_NIMBLE_SM_SC_ONLY
-#define MYNEWT_VAL_BLE_SM_SC_ONLY CONFIG_BT_NIMBLE_SM_SC_ONLY
-#else
-#define MYNEWT_VAL_BLE_SM_SC_ONLY (0)
-#endif
+#define MYNEWT_VAL_BLE_SM_SC_ONLY (CONFIG_BT_NIMBLE_SM_SC_ONLY)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST