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 6d97f991fd..0e8de67703 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -132,6 +132,10 @@
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_GATT_CSFC_SIZE
+#define MYNEWT_VAL_BLE_GATT_CSFC_SIZE (1)
+#endif
+
 #ifndef CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES
 #define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (1)
 #else
@@ -959,6 +963,10 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS CONFIG_BT_NIMBLE_MAX_CCCDS
 #endif
 
+#ifndef MYNEWT_VAL_BLE_STORE_MAX_CSFCS
+#define MYNEWT_VAL_BLE_STORE_MAX_CSFCS (CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
+#endif
+
 #ifdef CONFIG_BT_NIMBLE_MAX_EADS
 #define MYNEWT_VAL_BLE_STORE_MAX_EADS CONFIG_BT_NIMBLE_MAX_EADS
 #endif