diff --git a/src/audio/audio_stream.c b/src/audio/audio_stream.c
index 0308e036755c..2a1a7a05e64a 100644
--- a/src/audio/audio_stream.c
+++ b/src/audio/audio_stream.c
@@ -141,12 +141,6 @@ void audio_stream_init(struct audio_stream *audio_stream, void *buff_addr, uint3
 	audio_stream->addr = buff_addr;
 	audio_stream->end_addr = (char *)audio_stream->addr + size;
 
-	/* set the default alignment info.
-	 * set byte_align as 1 means no alignment limit on byte.
-	 * set frame_align as 1 means no alignment limit on frame.
-	 */
-	audio_stream_init_alignment_constants(1, 1, audio_stream);
-
 	source_init(audio_stream_get_source(audio_stream), &audio_stream_source_ops,
 		    &audio_stream->runtime_stream_params);
 	sink_init(audio_stream_get_sink(audio_stream), &audio_stream_sink_ops,
diff --git a/src/include/sof/audio/audio_stream.h b/src/include/sof/audio/audio_stream.h
index 49f3dab09245..75060b0e1ef3 100644
--- a/src/include/sof/audio/audio_stream.h
+++ b/src/include/sof/audio/audio_stream.h
@@ -348,25 +348,6 @@ static inline void audio_stream_set_buffer_fmt(struct audio_stream *buf,
 #define audio_stream_get_frag(buffer, ptr, idx, sample_size) \
 	audio_stream_wrap(buffer, (char *)(ptr) + ((idx) * (sample_size)))
 
-/**
- * Applies parameters to the buffer.
- * @param buffer Buffer.
- * @param params Parameters (frame format, rate, number of channels).
- * @return 0 if succeeded, error code otherwise.
- */
-static inline int audio_stream_set_params(struct audio_stream *buffer,
-					  struct sof_ipc_stream_params *params)
-{
-	if (!params)
-		return -EINVAL;
-
-	buffer->runtime_stream_params.frame_fmt = params->frame_fmt;
-	buffer->runtime_stream_params.rate = params->rate;
-	buffer->runtime_stream_params.channels = params->channels;
-
-	return 0;
-}
-
 /**
  * Calculates period size in bytes based on component stream's parameters.
  * @param buf Component buffer.
@@ -433,6 +414,31 @@ static inline void audio_stream_init_alignment_constants(const uint32_t byte_ali
 			(is_power_of_2(process_size) ? 31 : 32) - clz(process_size);
 }
 
+/**
+ * Applies parameters to the buffer.
+ * @param buffer Audio stream buffer.
+ * @param params Parameters (frame format, rate, number of channels).
+ * @return 0 if succeeded, error code otherwise.
+ */
+static inline int audio_stream_set_params(struct audio_stream *buffer,
+					  struct sof_ipc_stream_params *params)
+{
+	if (!params)
+		return -EINVAL;
+
+	buffer->runtime_stream_params.frame_fmt = params->frame_fmt;
+	buffer->runtime_stream_params.rate = params->rate;
+	buffer->runtime_stream_params.channels = params->channels;
+
+	/* set the default alignment info.
+	 * set byte_align as 1 means no alignment limit on byte.
+	 * set frame_align as 1 means no alignment limit on frame.
+	 */
+	audio_stream_init_alignment_constants(1, 1, buffer);
+
+	return 0;
+}
+
 /**
  * Calculates period size in bytes based on component stream's parameters.
  * @param buf Component buffer.