diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index d118a355d76..9abaf898d97 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -47,6 +47,16 @@ config BLUETOOTH_TINYCRYPT
 	  "If this option is set TinyCrypt library is used for Bluetooth
 	  cryptographic operations. If not set controller crypto is used"
 
+config BLUETOOTH_TINYCRYPT_ECC
+	bool "Use TinyCrypt library for ECDH"
+	default n
+	depends on BLUETOOTH_TINYCRYPT
+	select TINYCRYPT_ECC_DH
+	help
+	  If this option is set TinyCrypt library is also used for LE Secure
+	  Connections elliptic curve Diffie-Hellman key agreement. If not set
+	  controller crypto is used for ECDH.
+
 config  BLUETOOTH_HCI_CMD_COUNT
 	int "Number of HCI command buffers"
 	default 2
diff --git a/samples/bluetooth/shell/prj_x86.conf b/samples/bluetooth/shell/prj_x86.conf
index 7baeb9f939a..3f63d9f8c7a 100644
--- a/samples/bluetooth/shell/prj_x86.conf
+++ b/samples/bluetooth/shell/prj_x86.conf
@@ -11,4 +11,5 @@ CONFIG_BLUETOOTH_SIGNING=y
 CONFIG_BLUETOOTH_GATT_CLIENT=y
 CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BLUETOOTH_TINYCRYPT=y
+CONFIG_BLUETOOTH_TINYCRYPT_ECC=y
 CONFIG_CONSOLE_HANDLER_SHELL=y