diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c
index 2a679c2b57ef..8494f17998bd 100644
--- a/src/audio/pipeline/pipeline-graph.c
+++ b/src/audio/pipeline/pipeline-graph.c
@@ -369,7 +369,7 @@ static int pipeline_comp_reset(struct comp_dev *current,
 	 * scheduled together, except for IPC4, where each pipeline receives
 	 * commands from the host separately
 	 */
-	if (!is_single_ppl && IPC4_MOD_ID(current->ipc_config.id))
+	if (!is_single_ppl && IS_ENABLED(CONFIG_IPC_MAJOR_4))
 		return 0;
 
 	/* Propagate reset across pipelines only in the same direction
diff --git a/src/audio/pipeline/pipeline-params.c b/src/audio/pipeline/pipeline-params.c
index 16273e0897d4..ed32fc9e3b02 100644
--- a/src/audio/pipeline/pipeline-params.c
+++ b/src/audio/pipeline/pipeline-params.c
@@ -267,7 +267,7 @@ static int pipeline_comp_prepare(struct comp_dev *current,
 
 	if (!comp_is_single_pipeline(current, ppl_data->start)) {
 		/* ipc4 module is only prepared in its parent pipeline */
-		if (IPC4_MOD_ID(current->ipc_config.id))
+		if (IS_ENABLED(CONFIG_IPC_MAJOR_4))
 			return 0;
 
 		/* Propagate prepare only to pipelines in the same direction */
diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c
index 45fd1eed639c..f8d5c09f2c1b 100644
--- a/src/audio/pipeline/pipeline-schedule.c
+++ b/src/audio/pipeline/pipeline-schedule.c
@@ -140,7 +140,7 @@ static enum task_state pipeline_task_cmd(struct pipeline *p,
 			err = SOF_TASK_STATE_RESCHEDULE;
 		} else if (p->status == COMP_STATE_PAUSED) {
 			/* reset the pipeline components for IPC4 after the STOP trigger */
-			if (cmd == COMP_TRIGGER_STOP && IPC4_MOD_ID(host->ipc_config.id)) {
+			if (cmd == COMP_TRIGGER_STOP && IS_ENABLED(CONFIG_IPC_MAJOR_4)) {
 				err = pipeline_reset(host->pipeline, host);
 				if (err < 0)
 					reply->error = err;
@@ -284,6 +284,16 @@ void pipeline_schedule_triggered(struct pipeline_walk_context *ctx,
 	struct pipeline *p;
 	uint32_t flags;
 
+#ifdef CONFIG_IPC_MAJOR_4
+	/*
+	 * With IPC4, each pipeline is triggered separately. Exactly 1 pipeline
+	 * is expected in the pipelines list (it's unclear whether an empty list
+	 * should be tolerated).
+	 */
+	assert(list_is_empty(&ctx->pipelines) ||
+	   list_item_is_last(ctx->pipelines.next, &ctx->pipelines));
+#endif
+
 	/*
 	 * Interrupts have to be disabled while adding tasks to or removing them
 	 * from the scheduler list. Without that scheduling can begin
diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c
index 8bfdfc182912..e4a166554fa2 100644
--- a/src/audio/pipeline/pipeline-stream.c
+++ b/src/audio/pipeline/pipeline-stream.c
@@ -229,7 +229,7 @@ static int pipeline_comp_list(struct comp_dev *current,
 	 * component and we aren't using IPC4. With IPC4 each pipeline receives
 	 * commands separately so we don't need to trigger them together
 	 */
-	if (!is_single_ppl && (!is_same_sched || IPC4_MOD_ID(current->ipc_config.id))) {
+	if (!is_single_ppl && (!is_same_sched || IS_ENABLED(CONFIG_IPC_MAJOR_4))) {
 		pipe_dbg(current->pipeline,
 			 "current is from another pipeline");
 		return 0;
diff --git a/src/ipc/ipc4/handler-user.c b/src/ipc/ipc4/handler-user.c
index 5a5f3d6d6f32..1de694c04e28 100644
--- a/src/ipc/ipc4/handler-user.c
+++ b/src/ipc/ipc4/handler-user.c
@@ -543,17 +543,6 @@ static int ipc4_set_pipeline_state(struct ipc4_message_request *ipc4)
 			ipc_compound_pre_start(state.primary.r.type);
 			ret = ipc4_pipeline_trigger(ppl_icd, cmd, &delayed);
 			ipc_compound_post_start(state.primary.r.type, ret, delayed);
-			if (delayed) {
-				/* To maintain pipeline order for triggers, we must
-				 * do a blocking wait until trigger is processed.
-				 * This will add a max delay of 'ppl_count' LL ticks
-				 * to process the full trigger list.
-				 */
-				if (ipc_wait_for_compound_msg() != 0) {
-					ipc_cmd_err(&ipc_tr, "ipc4: fail with delayed trigger");
-					return IPC4_FAILURE;
-				}
-			}
 		}
 
 		if (ret != 0)