diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 3ed7e29359..3f277747cc 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -700,8 +700,16 @@ if BT_NIMBLE_50_FEATURE_SUPPORT
         default 64
         help
             Set this option to set the upper limit on number of descriptors 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.
 endif
 
+
 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 327aa3fae7..df9096d74f 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -158,6 +158,12 @@
 #define MYNEWT_VAL_BLE_GATT_CACHING_MAX_DSCS  (0)
 #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
+
 #endif
 
 #ifndef MYNEWT_VAL_BLE_GATT_CSFC_SIZE