diff --git a/nimble/controller/src/ble_ll_hci_ev.c b/nimble/controller/src/ble_ll_hci_ev.c
index fb4424a59..dc7480625 100644
--- a/nimble/controller/src/ble_ll_hci_ev.c
+++ b/nimble/controller/src/ble_ll_hci_ev.c
@@ -643,16 +643,16 @@ void
 ble_ll_hci_ev_send_vs_llcp_trace(uint8_t type, uint16_t handle, uint16_t count,
                                  void *pdu, size_t length)
 {
-    struct ble_hci_ev_vs_debug *ev;
+    struct ble_hci_ev_vs *ev;
     struct ble_hci_ev *hci_ev;
 
     hci_ev = ble_transport_alloc_evt(1);
     if (hci_ev) {
-        hci_ev->opcode = BLE_HCI_EVCODE_VS_DEBUG;
+        hci_ev->opcode = BLE_HCI_EVCODE_VS;
         hci_ev->length = sizeof(*ev) + 8 + length;
         ev = (void *) hci_ev->data;
 
-        ev->id = 0x17;
+        ev->id = BLE_HCI_VS_SUBEV_ID_LLCP_TRACE;
         ev->data[0] = type;
         put_le16(&ev->data[1], handle);
         put_le16(&ev->data[3], count);
diff --git a/nimble/include/nimble/hci_common.h b/nimble/include/nimble/hci_common.h
index 93429a2f5..742824d87 100644
--- a/nimble/include/nimble/hci_common.h
+++ b/nimble/include/nimble/hci_common.h
@@ -1611,6 +1611,8 @@ struct ble_hci_ev_vs_css_slot_changed {
     uint16_t slot_idx;
 };
 
+#define BLE_HCI_VS_SUBEV_ID_LLCP_TRACE          (0x17)
+
 /* LE sub-event codes */
 #define BLE_HCI_LE_SUBEV_CONN_COMPLETE          (0x01)
 struct ble_hci_ev_le_subev_conn_complete {