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 ecb5989624..6228d87f89 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -814,7 +814,7 @@
 #define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
 #endif
 
-#if 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_COC_MAX_NUM (CONFIG_BT_NIMBLE_EATT_CHAN_NUM)
 #else
 #ifndef CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM
@@ -958,7 +958,11 @@
 #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
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST