diff --git a/src/classic/avrcp.c b/src/classic/avrcp.c
index 961db784e..a288ad813 100644
--- a/src/classic/avrcp.c
+++ b/src/classic/avrcp.c
@@ -414,6 +414,7 @@ static avrcp_connection_t * avrcp_create_connection(avrcp_role_t role, bd_addr_t
     connection->state = AVCTP_CONNECTION_IDLE;
     connection->role = role;
     connection->transaction_label = 0xFF;
+    connection->transaction_id_counter = 0;
     connection->max_num_fragments = 0xFF;
     log_info("avrcp_create_connection, role %d", role);
     (void)memcpy(connection->remote_addr, remote_addr, 6);
diff --git a/src/classic/avrcp.h b/src/classic/avrcp.h
index f2ba1c357..de9c42841 100644
--- a/src/classic/avrcp.h
+++ b/src/classic/avrcp.h
@@ -467,8 +467,12 @@ typedef struct {
     uint8_t transport_header;
     uint16_t invalid_pid;
 
+    // transaction id 
+    uint8_t transaction_id_counter;
+    
     // command
     uint8_t transaction_label;
+    
     avrcp_command_opcode_t command_opcode;
     avrcp_command_type_t command_type;
     avrcp_subunit_type_t subunit_type;
diff --git a/src/classic/avrcp_controller.c b/src/classic/avrcp_controller.c
index 92d933cf7..6ed8250b9 100644
--- a/src/classic/avrcp_controller.c
+++ b/src/classic/avrcp_controller.c
@@ -49,14 +49,13 @@
 
 // made public in avrcp_controller.h
 avrcp_context_t avrcp_controller_context;
-static uint16_t transaction_id_counter = 0;
 
-static uint8_t avrcp_controller_get_next_transaction_label(void){
-    transaction_id_counter++;
-    if (transaction_id_counter == 16){
-        transaction_id_counter = 1;
+static uint8_t avrcp_controller_get_next_transaction_label(avrcp_connection_t * connection){
+    connection->transaction_id_counter++;
+    if (connection->transaction_id_counter == 16){
+        connection->transaction_id_counter = 1;
     }
-    return transaction_id_counter;
+    return connection->transaction_id_counter;
 }
 
 static uint16_t avrcp_get_max_payload_size_for_packet_type(avrcp_packet_type_t packet_type){
@@ -483,7 +482,7 @@ static int avrcp_send_register_notification(avrcp_connection_t * connection, uin
     uint8_t command[18];
     uint16_t pos = 0; 
     // transport header : transaction label | Packet_type | C/R | IPID (1 == invalid profile identifier)
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     command[pos++] = (connection->transaction_label << 4) | (AVRCP_SINGLE_PACKET << 2) | (AVRCP_COMMAND_FRAME << 1) | 0;
     
     command[pos++] = BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL >> 8;
@@ -533,7 +532,7 @@ static uint8_t avrcp_controller_request_pass_through_release_control_cmd(avrcp_c
         avrcp_press_and_hold_timer_stop(connection);
     }
     connection->cmd_operands[0] = 0x80 | connection->cmd_operands[0];
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
     return ERROR_CODE_SUCCESS;
 }
@@ -570,7 +569,7 @@ static inline uint8_t avrcp_controller_request_pass_through_press_control_cmd(ui
         avrcp_press_and_hold_timer_start(connection);
     }
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
     return ERROR_CODE_SUCCESS;
 }
@@ -594,7 +593,7 @@ static int avrcp_controller_register_notification(avrcp_connection_t * connectio
 
 static uint8_t avrcp_controller_request_abort_continuation(avrcp_connection_t * connection){
     connection->state = AVCTP_W2_SEND_COMMAND;
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -616,7 +615,7 @@ static uint8_t avrcp_controller_request_abort_continuation(avrcp_connection_t *
 
 static uint8_t avrcp_controller_request_continue_response(avrcp_connection_t * connection){
     connection->state = AVCTP_W2_SEND_COMMAND;
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1179,7 +1178,7 @@ uint8_t avrcp_controller_unit_info(uint16_t avrcp_cid){
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_UNIT_INFO;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_UNIT; //vendor unique
@@ -1199,7 +1198,7 @@ uint8_t avrcp_controller_subunit_info(uint16_t avrcp_cid){
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_SUBUNIT_INFO;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_UNIT; //vendor unique
@@ -1220,7 +1219,7 @@ static uint8_t avrcp_controller_get_capabilities(uint16_t avrcp_cid, uint8_t cap
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1251,7 +1250,7 @@ uint8_t avrcp_controller_get_play_status(uint16_t avrcp_cid){
     }
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1274,7 +1273,7 @@ uint8_t avrcp_controller_set_addressed_player(uint16_t avrcp_cid, uint16_t addre
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1306,7 +1305,7 @@ uint8_t avrcp_controller_get_now_playing_info(uint16_t avrcp_cid){
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1342,7 +1341,7 @@ uint8_t avrcp_controller_set_absolute_volume(uint16_t avrcp_cid, uint8_t volume)
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1372,7 +1371,7 @@ uint8_t avrcp_controller_query_shuffle_and_repeat_modes(uint16_t avrcp_cid){
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
     
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_STATUS;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1401,7 +1400,7 @@ static uint8_t avrcp_controller_set_current_player_application_setting_value(uin
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_COMMAND;
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@@ -1445,7 +1444,7 @@ uint8_t avrcp_controller_play_item_for_scope(uint16_t avrcp_cid, uint8_t * uid,
     } 
     connection->state = AVCTP_W2_SEND_COMMAND;
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
     connection->subunit_id = AVRCP_SUBUNIT_ID;
@@ -1485,7 +1484,7 @@ uint8_t avrcp_controller_add_item_from_scope_to_now_playing_list(uint16_t avrcp_
     } 
     connection->state = AVCTP_W2_SEND_COMMAND;
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_type = AVRCP_CTYPE_CONTROL;
     connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
     connection->subunit_id = AVRCP_SUBUNIT_ID;
@@ -1533,7 +1532,7 @@ uint8_t avrcp_controller_send_custom_command(uint16_t avrcp_cid, avrcp_command_t
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     connection->state = AVCTP_W2_SEND_FRAGMENTED_COMMAND;
 
-    connection->transaction_label = avrcp_controller_get_next_transaction_label();
+    connection->transaction_label = avrcp_controller_get_next_transaction_label(connection);
     connection->command_opcode = command_opcode;
     connection->command_type = command_type;
     connection->subunit_type = subunit_type;