diff --git a/src/btstack_defines.h b/src/btstack_defines.h
index e4cdb3f91..7522c8b7a 100644
--- a/src/btstack_defines.h
+++ b/src/btstack_defines.h
@@ -1153,8 +1153,12 @@ typedef uint8_t sm_key_t[16];
 #define HCI_EVENT_BIS_CAN_SEND_NOW                         0x6Bu
 
 /**
- * @format H
+ * @format 11H11
+ * @param cig_id
+ * @param cis_id
  * @param cis_con_handle
+ * @param stream_index
+ * @param group_complete
  */
 #define HCI_EVENT_CIS_CAN_SEND_NOW                         0x6Cu
 
diff --git a/src/btstack_event.h b/src/btstack_event.h
index ba8200994..48c96f278 100644
--- a/src/btstack_event.h
+++ b/src/btstack_event.h
@@ -1712,6 +1712,24 @@ static inline hci_con_handle_t hci_event_bis_can_send_now_get_con_handle(const u
     return little_endian_read_16(event, 4);
 }
 
+/**
+ * @brief Get field cig_id from event HCI_EVENT_CIS_CAN_SEND_NOW
+ * @param event packet
+ * @return cig_id
+ * @note: btstack_type 1
+ */
+static inline uint8_t hci_event_cis_can_send_now_get_cig_id(const uint8_t * event){
+    return event[2];
+}
+/**
+ * @brief Get field cis_id from event HCI_EVENT_CIS_CAN_SEND_NOW
+ * @param event packet
+ * @return cis_id
+ * @note: btstack_type 1
+ */
+static inline uint8_t hci_event_cis_can_send_now_get_cis_id(const uint8_t * event){
+    return event[3];
+}
 /**
  * @brief Get field cis_con_handle from event HCI_EVENT_CIS_CAN_SEND_NOW
  * @param event packet
@@ -1719,7 +1737,25 @@ static inline hci_con_handle_t hci_event_bis_can_send_now_get_con_handle(const u
  * @note: btstack_type H
  */
 static inline hci_con_handle_t hci_event_cis_can_send_now_get_cis_con_handle(const uint8_t * event){
-    return little_endian_read_16(event, 2);
+    return little_endian_read_16(event, 4);
+}
+/**
+ * @brief Get field stream_index from event HCI_EVENT_CIS_CAN_SEND_NOW
+ * @param event packet
+ * @return stream_index
+ * @note: btstack_type 1
+ */
+static inline uint8_t hci_event_cis_can_send_now_get_stream_index(const uint8_t * event){
+    return event[6];
+}
+/**
+ * @brief Get field group_complete from event HCI_EVENT_CIS_CAN_SEND_NOW
+ * @param event packet
+ * @return group_complete
+ * @note: btstack_type 1
+ */
+static inline uint8_t hci_event_cis_can_send_now_get_group_complete(const uint8_t * event){
+    return event[7];
 }
 
 
diff --git a/src/hci.c b/src/hci.c
index acc035ff2..9b0873eff 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -10474,12 +10474,17 @@ static void hci_emit_cis_can_send_now(const hci_iso_stream_t* iso_stream, uint8_
     UNUSED(stream_index);
     UNUSED(group_complete);
 
-    uint8_t event[4];
+    uint8_t event[8];
     uint16_t pos = 0;
     event[pos++] = HCI_EVENT_CIS_CAN_SEND_NOW;
     event[pos++] = sizeof(event) - 2;
+    event[pos++] = iso_stream->group_id;
+    event[pos++] = iso_stream->stream_id;
     little_endian_store_16(event, pos, iso_stream->cis_handle);
-    hci_emit_btstack_event(&event[0], sizeof(event), 0);  // don't dump
+    pos += 2;
+    event[pos++] = stream_index;
+    event[pos++] = group_complete;
+    hci_emit_btstack_event(&event[0], pos, 0);  // don't dump
 }
 
 static le_audio_big_t * hci_big_for_handle(uint8_t big_handle){