diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a763626..046599db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - AVRCP/AVCTP: report AVRCP 1.6 and AVCTP 1.4 in SDP record
 - SM: only trigger Cross-Transport Key Derivation (CTKD) when bonding is enabled
+- SM: store CTKD key with Public Identity Address
 - HFP HF: fix response to AG Codec Selection while waiting for OK of parallel command
 
 ### Added
diff --git a/src/ble/sm.c b/src/ble/sm.c
index 11b6eedcd..532f3b2cf 100644
--- a/src/ble/sm.c
+++ b/src/ble/sm.c
@@ -1535,11 +1535,7 @@ static void sm_sc_cmac_done(uint8_t * hash){
             link_key_type = sm_conn->sm_connection_authenticated ?
                 AUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P256 : UNAUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P256;
             log_info("Derived classic link key from LE using h6, type %u", (int) link_key_type);
-            if (IS_RESPONDER(sm_conn->sm_role)){
-                gap_store_link_key_for_bd_addr(setup->sm_m_address, setup->sm_t, link_key_type);
-            } else {
-                gap_store_link_key_for_bd_addr(setup->sm_s_address, setup->sm_t, link_key_type);
-            }
+			gap_store_link_key_for_bd_addr(setup->sm_peer_address, setup->sm_t, link_key_type);
 #endif
             if (IS_RESPONDER(sm_conn->sm_role)){
                 sm_conn->sm_engine_state = SM_RESPONDER_IDLE;