diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 51d979eb9..92125af60 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -6157,6 +6157,7 @@ ble_gap_pairing_req_event(const struct ble_gap_pairing_req *req)
 
     memset(&event, 0, sizeof event);
     event.type = BLE_GAP_EVENT_PAIRING_REQUEST;
+    event.pairing_req.conn_handle = req->conn_handle;
     event.pairing_req.io_cap = req->io_cap;
     event.pairing_req.oob_data_flag = req->oob_data_flag;
     event.pairing_req.authreq = req->authreq;
diff --git a/nimble/host/src/ble_sm.c b/nimble/host/src/ble_sm.c
index dbcee7758..c4d2204a0 100644
--- a/nimble/host/src/ble_sm.c
+++ b/nimble/host/src/ble_sm.c
@@ -883,7 +883,6 @@ static int
 ble_sm_pairing_req(uint16_t conn_handle, struct ble_sm_pair_cmd *req)
 {
     struct ble_gap_pairing_req pair_req;
-    int rc;
 
     pair_req.conn_handle = conn_handle;
     pair_req.io_cap = req->io_cap;