diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index df9c3b2140..5f76a37333 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -633,8 +633,9 @@ config BT_NIMBLE_PERIODIC_ADV_ENH
 menuconfig BT_NIMBLE_GATT_CACHING
     bool "Enable GATT caching"
     depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
+    select BT_NIMBLE_DYNAMIC_SERVICE
     help
-            Enable GATT caching
+        Enable GATT caching
 config BT_NIMBLE_GATT_CACHING_MAX_CONNS
     int "Maximum connections to be cached"
     depends on BT_NIMBLE_GATT_CACHING
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index 299279a467..c0dd77a835 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 299279a46795a6de44c2683cae6f85e0c68cb551
+Subproject commit c0dd77a8355dd82d0bc1b501e6d118a91eb14df1
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 6d2a9cf8aa..6a47d90f1d 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -133,10 +133,31 @@
 #define MYNEWT_VAL_BLE_GATT_CACHING (0)
 #else
 #define MYNEWT_VAL_BLE_GATT_CACHING           (CONFIG_BT_NIMBLE_GATT_CACHING)
+
+#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CONNS
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CONNS (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CONNS)
+#else
+#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CONNS (0)
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS)
+#else
+#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS  (0)
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS)
+#else
+#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS  (0)
+#endif
+
+#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS)
+#else
+#define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS  (0)
+#endif
+
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES
@@ -487,7 +508,11 @@
 /*** @apache-mynewt-nimble/nimble/host */
 
 #ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE
+#ifdef CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
 #define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
+#else
+#define MYNEWT_VAL_BLE_DYNAMIC_SERVICE (0)
+#endif
 #endif
 
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
@@ -848,7 +873,11 @@
 
 
 #ifndef MYNEWT_VAL_BLE_SM_SC_LVL
+#ifdef CONFIG_BT_NIMBLE_SM_SC_LVL
 #define MYNEWT_VAL_BLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_SC_LVL
+#else
+#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
+#endif
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY