diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
index a58e0f252..259d5b040 100644
--- a/src/ipc/ipc4/helper.c
+++ b/src/ipc/ipc4/helper.c
@@ -135,6 +135,16 @@ struct comp_dev *comp_new_ipc4(struct ipc4_module_init_instance *module_init)
 	return dev;
 }
 
+static struct ipc_comp_dev *get_comp(struct ipc *ipc, uint16_t type, uint32_t id)
+{
+	struct ipc_comp_dev *c = ipc_get_comp_by_id(ipc, id);
+
+	if (c && c->type == type)
+		return c;
+
+	return NULL;
+}
+
 struct ipc_comp_dev *ipc_get_comp_by_ppl_id(struct ipc *ipc, uint16_t type, uint32_t ppl_id)
 {
 	struct ipc_comp_dev *icd;
@@ -283,7 +293,7 @@ int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id)
 	int ret;
 
 	/* check whether pipeline exists */
-	ipc_pipe = ipc_get_comp_by_id(ipc, comp_id);
+	ipc_pipe = get_comp(ipc, COMP_TYPE_PIPELINE, comp_id);
 	if (!ipc_pipe)
 		return IPC4_INVALID_RESOURCE_ID;
 
@@ -608,7 +618,7 @@ int ipc4_pipeline_complete(struct ipc *ipc, uint32_t comp_id)
 	struct ipc_comp_dev *ipc_pipe;
 	int ret;
 
-	ipc_pipe = ipc_get_comp_by_id(ipc, comp_id);
+	ipc_pipe = get_comp(ipc, COMP_TYPE_PIPELINE, comp_id);
 
 	/* Pass IPC to target core */
 	if (!cpu_is_me(ipc_pipe->core))
@@ -728,14 +738,9 @@ const struct comp_driver *ipc4_get_comp_drv(int module_id)
 
 struct comp_dev *ipc4_get_comp_dev(uint32_t comp_id)
 {
-	struct ipc *ipc = ipc_get();
-	struct ipc_comp_dev *icd;
+	struct ipc_comp_dev *icd = get_comp(ipc_get(), COMP_TYPE_COMPONENT, comp_id);
 
-	icd = ipc_get_comp_by_id(ipc, comp_id);
-	if (!icd)
-		return NULL;
-
-	return icd->cd;
+	return icd ? icd->cd : NULL;
 }
 
 int ipc4_add_comp_dev(struct comp_dev *dev)