diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 9ceb94ff20..40d9afd292 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -691,6 +691,14 @@ config BT_NIMBLE_GATT_CACHING_MAX_DSCS
     help
         Set this option to set the upper limit on number of discriptors per connection to be cached.
 
+config BT_NIMBLE_GATT_CACHING_DISABLE_AUTO
+    bool "Do not start discovery procedure automatically upon receiving Out of Sync"
+    depends on BT_NIMBLE_GATT_CACHING
+    default n
+    help
+        When client receives ATT out-of-sync error message, it will not automatically start the discovery procedure
+        to correct the invalid cache.
+
 config BT_NIMBLE_WHITELIST_SIZE
     int "BLE white list size"
     depends on BT_NIMBLE_ENABLED
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 540f5ae24a..8de3dfa3ea 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -130,7 +130,14 @@
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_SVCS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_SVCS)
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_CHRS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_CHRS)
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS  (CONFIG_BT_NIMBLE_GATT_CACHING_MAX_DSCS)
-#endif
+
+#ifdef CONFIG_BT_NIMBLE_GATT_CACHING_DISABLE_AUTO
+#define MYNEWT_VAL_BLE_GATT_CACHING_DISABLE_AUTO (CONFIG_BT_NIMBLE_GATT_CACHING_DISABLE_AUTO)
+#else
+#define MYNEWT_VAL_BLE_GATT_CACHING_DISABLE_AUTO (0)
+#endif /* CONFIG_BT_NIMBLE_GATT_CACHING_DISABLE_AUTO */
+
+#endif /* CONFIG_BT_NIMBLE_GATT_CACHING */
 
 #ifndef MYNEWT_VAL_BLE_GATT_CSFC_SIZE
 #define MYNEWT_VAL_BLE_GATT_CSFC_SIZE (1)