diff --git a/sound/soc/sof/intel/hda-trace.c b/sound/soc/sof/intel/hda-trace.c
index 3d36db3b1aa22e..8e01fb3677810c 100644
--- a/sound/soc/sof/intel/hda-trace.c
+++ b/sound/soc/sof/intel/hda-trace.c
@@ -76,7 +76,6 @@ int hda_dsp_trace_release(struct snd_sof_dev *sdev)
 
 	if (sdev->hda->dtrace_stream) {
 		hstream = &sdev->hda->dtrace_stream->hstream;
-		hstream->opened = false;
 		hda_dsp_stream_put(sdev,
 				   SNDRV_PCM_STREAM_CAPTURE,
 				   hstream->stream_tag);
diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c
index 5db0aaca3bf0fb..0769f44db2a803 100644
--- a/sound/soc/sof/trace.c
+++ b/sound/soc/sof/trace.c
@@ -160,7 +160,6 @@ int snd_sof_init_trace_ipc(struct snd_sof_dev *sdev)
 	params.buffer.offset = 0;
 	params.buffer.pages = sdev->dma_trace_pages;
 
-	init_waitqueue_head(&sdev->trace_sleep);
 	sdev->host_offset = 0;
 
 	ret = snd_sof_dma_trace_init(sdev, &params.stream_tag);
@@ -233,6 +232,8 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev)
 			goto table_err;
 	}
 
+	init_waitqueue_head(&sdev->trace_sleep);
+
 	ret = snd_sof_init_trace_ipc(sdev);
 	if (ret < 0)
 		goto table_err;