diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 9a6b6ada0644..0ecd3aaa16a1 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -1122,7 +1122,7 @@ static int q6afe_svc_set_params_v1(int index, struct mem_mapping_hdr *mem_hdr,
 	svc_set_param->apr_hdr.pkt_size = size;
 	svc_set_param->apr_hdr.src_port = 0;
 	svc_set_param->apr_hdr.dest_port = 0;
-	svc_set_param->apr_hdr.token = IDX_GLOBAL_CFG;
+	svc_set_param->apr_hdr.token = index;
 	svc_set_param->apr_hdr.opcode = AFE_SVC_CMD_SET_PARAM;
 	svc_set_param->payload_size = packed_data_size;
 
@@ -1169,7 +1169,7 @@ static int q6afe_svc_set_params_v2(int index, struct mem_mapping_hdr *mem_hdr,
 	svc_set_param->apr_hdr.pkt_size = size;
 	svc_set_param->apr_hdr.src_port = 0;
 	svc_set_param->apr_hdr.dest_port = 0;
-	svc_set_param->apr_hdr.token = IDX_GLOBAL_CFG;
+	svc_set_param->apr_hdr.token = index;
 	svc_set_param->apr_hdr.opcode = AFE_SVC_CMD_SET_PARAM_V2;
 	svc_set_param->payload_size = packed_data_size;