diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 00a7051191..dc0fb9fbb2 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -164,7 +164,7 @@ menu "Security (SMP)"
                 2(1). Unauthenticated pairing with encryption
                 3(2). Authenticated pairing with encryption
                 4(3). Authenticated LE Secure Connections pairing with encryption using a
-                      128-bit strength encryption key.
+                128-bit strength encryption key.
 
         config BT_NIMBLE_SM_SC_ONLY
             int "Enable Secure Connections Only Mode"
@@ -297,7 +297,7 @@ menu "GAP"
 
     config BT_NIMBLE_CRYPTO_STACK_MBEDTLS
         bool "Override TinyCrypt with mbedTLS for crypto computations"
-        default y
+        default n if CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT
         depends on BT_NIMBLE_ENABLED
         select MBEDTLS_CMAC_C
         help
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index f117896558..5b0cb71162 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit f117896558b4bcd744d61176a197b12b5e8ffe3f
+Subproject commit 5b0cb711627fcd9c6d2d8c430123a9e3385d1993