diff --git a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/AArch64/ModuleEntryPoint.S b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/AArch64/ModuleEntryPoint.S
index f8f8877927..6d4866ddb7 100644
--- a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/AArch64/ModuleEntryPoint.S
+++ b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/AArch64/ModuleEntryPoint.S
@@ -81,8 +81,8 @@ ASM_FUNC(SetStackPermissionFfa)
   // x1 = stmm_stack top
   mov x1, x0
 
-  // x12 = Compute and save the stack base
-  add x12, x1, x2
+  // x24 = Compute and save the stack base
+  add x24, x1, x2
 
   // x2 = Count of pages of stmm_stack
   lsr x2, x2, #EFI_PAGE_SHIFT
@@ -110,7 +110,7 @@ ASM_FUNC(SetStackPermissionFfa)
   cmp x10, #0x00
 
   // Set return value as base address of stack.
-  mov x0, x12
+  mov x0, x24
   b.ne .Lout_set_stack_perm_ffa
   // If failed, set return value as zero.
   mov x0, #0x00
@@ -119,7 +119,7 @@ ASM_FUNC(SetStackPermissionFfa)
   mov x9, xzr
   mov x10, xzr
   mov x11, xzr
-  mov x12, xzr
+  mov x24, xzr
   ret
 
 //