diff --git a/nimble/host/src/ble_sm.c b/nimble/host/src/ble_sm.c
index d74b96bb3..53bd27da4 100644
--- a/nimble/host/src/ble_sm.c
+++ b/nimble/host/src/ble_sm.c
@@ -538,6 +538,11 @@ ble_sm_persist_keys(struct ble_sm_proc *proc)
             case BLE_ADDR_PUBLIC:
             case BLE_ADDR_PUBLIC_ID:
                 conn->bhc_peer_addr.type = BLE_ADDR_PUBLIC_ID;
+#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
+                /* In case of Host based privacy, we should not be changing
+                 * peer address type to BLE_ADDR_PUBLIC_ID */
+                conn->bhc_peer_addr.type = BLE_ADDR_PUBLIC;
+#endif
                 break;
 
             case BLE_ADDR_RANDOM: