diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index 5af7b88a1e0..85518c09717 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -11,6 +11,8 @@ if BLUETOOTH_HCI
 config BLUETOOTH_RPA
 	# Virtual/hidden option
 	bool
+	select TINYCRYPT
+	select TINYCRYPT_AES
 	default n
 
 config BLUETOOTH_DEBUG
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index f3c49eb810b..6c3cca9805f 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -189,7 +189,6 @@ config BLUETOOTH_ATT_TX_MAX
 
 config BLUETOOTH_SMP
 	bool "Security Manager Protocol support"
-	select BLUETOOTH_RPA
 	select TINYCRYPT
 	select TINYCRYPT_AES
 	select TINYCRYPT_AES_CMAC
@@ -200,6 +199,7 @@ config BLUETOOTH_SMP
 if BLUETOOTH_SMP
 config BLUETOOTH_PRIVACY
 	bool "Privacy Feature"
+	select BLUETOOTH_RPA
 	help
 	  Enable local Privacy Feature support. This makes it possible
 	  to use Resolvable Private Addresses (RPAs).