diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 97625f1248..7eb98fbda9 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -717,6 +717,14 @@ if BT_NIMBLE_50_FEATURE_SUPPORT
 endif
 
 
+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 6228d87f89..623e8acbb9 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