diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index a92a63a7c444..e946f0169fe7 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -569,6 +569,11 @@ kbd_status_changed(bthid_session_p s, uint8_t *data, int32_t len)
 	}
 	hid_end_parse(d);
 
+	if (report_id != NO_REPORT_ID) {
+		data[2] = data[1];
+		data[1] = report_id;
+	}
+
 	if (found)
 		write(s->intr, data, (report_id != NO_REPORT_ID) ? 3 : 2);