diff --git a/nimble/host/src/ble_hs_conn.c b/nimble/host/src/ble_hs_conn.c
index eb749c41a..ff4183483 100644
--- a/nimble/host/src/ble_hs_conn.c
+++ b/nimble/host/src/ble_hs_conn.c
@@ -480,11 +480,13 @@ ble_hs_conn_addrs(const struct ble_hs_conn *conn,
     case BLE_ADDR_PUBLIC_ID:
         addrs->peer_id_addr.type = BLE_ADDR_PUBLIC;
         addrs->peer_ota_addr = conn->bhc_peer_rpa_addr;
+        addrs->peer_ota_addr.type = conn->bhc_peer_addr.type;
         break;
 
     case BLE_ADDR_RANDOM_ID:
         addrs->peer_id_addr.type = BLE_ADDR_RANDOM;
         addrs->peer_ota_addr = conn->bhc_peer_rpa_addr;
+        addrs->peer_ota_addr.type = conn->bhc_peer_addr.type;
         break;
 
     default: