diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index a6537fcade..c0ea8e9f11 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -559,6 +559,16 @@ config BT_NIMBLE_MAX_CONN_REATTEMPT
     help
         Defines maximum number of connection reattempts.
 
+config BT_NIMBLE_HANDLE_REPEAT_PAIRING_DELETION
+    bool "Enable stack handling of repeat pairing"
+    default n
+    depends on BT_NIMBLE_ENABLED
+    help
+        Use this option to let stack internally handle the request for repeat pairing.
+        Enabling this option will delete the pairing of the device and stack will NOT post any event
+        to application. If this option is disabled, application will get BLE_GAP_EVENT_REPEAT_PAIRING
+        event.
+
 menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
     bool "Enable BLE 5 feature"
     depends on BT_NIMBLE_ENABLED && (SOC_BLE_50_SUPPORTED || !BT_CONTROLLER_ENABLED)
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index 7d06b1c8ca..7c18dde8d7 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 7d06b1c8ca6dada6a6fa503a13d8393f7e63d233
+Subproject commit 7c18dde8d7d8edd05087330347a84c5e43bd29e3
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 c9d399ef0d..138b2460f2 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -2024,4 +2024,12 @@
 #endif
 #endif
 
+#ifndef MYNEWT_VAL_BLE_HANDLE_REPEAT_PAIRING_DELETION
+#ifdef CONFIG_BT_NIMBLE_HANDLE_REPEAT_PAIRING_DELETION
+#define MYNEWT_VAL_BLE_HANDLE_REPEAT_PAIRING_DELETION (CONFIG_BT_NIMBLE_HANDLE_REPEAT_PAIRING_DELETION)
+#else
+#define MYNEWT_VAL_BLE_HANDLE_REPEAT_PAIRING_DELETION (0)
+#endif
+#endif
+
 #endif