diff --git a/core/pta/stm32mp/remoteproc_pta.c b/core/pta/stm32mp/remoteproc_pta.c
index 2f2fcab5335..008e0e36f50 100644
--- a/core/pta/stm32mp/remoteproc_pta.c
+++ b/core/pta/stm32mp/remoteproc_pta.c
@@ -21,9 +21,9 @@
 
 /*
  * UUID of the remoteproc Trusted application authorized to communicate with
- * the remoteproc pseudo TA
+ * the remoteproc pseudo TA. The UID should match the one defined in the
+ * ta_remoteproc.h header file.
  */
-
 #define TA_REMOTEPROC_UUID \
 	{ 0x80a4c275, 0x0a47, 0x4905, \
 		{ 0x82, 0x85, 0x14, 0x86, 0xa9, 0x77, 0x1a, 0x08} }
@@ -111,7 +111,7 @@ static TEE_Result rproc_pta_load_segment(uint32_t pt,
 	if (res)
 		memset(dst, 0, size);
 
-	stm32_rproc_unmap(params[0].value.a, pa, size);
+	stm32_rproc_unmap(params[0].value.a, dst, size);
 
 	return res;
 }
@@ -149,7 +149,7 @@ static TEE_Result rproc_pta_set_memory(uint32_t pt,
 
 	memset(dst, value, size);
 
-	return stm32_rproc_unmap(params[0].value.a, pa, size);
+	return stm32_rproc_unmap(params[0].value.a, dst, size);
 }
 
 static TEE_Result rproc_pta_da_to_pa(uint32_t pt,