diff --git a/portable/GCC/RISC-V/portASM.S b/portable/GCC/RISC-V/portASM.S
index b5f054777..9e422c6b2 100644
--- a/portable/GCC/RISC-V/portASM.S
+++ b/portable/GCC/RISC-V/portASM.S
@@ -382,3 +382,13 @@ application_exception_handler:
 processed_source:
     portcontextRESTORE_CONTEXT
 /*-----------------------------------------------------------*/
+
+/* Update the portcontextSAVE_CONTEXT_INTERNAL macro to save memory protection context */
+.macro portcontextSAVE_CONTEXT_INTERNAL
+    portasmSAVE_MEMORY_PROTECTION_CONTEXT
+.endm
+
+/* Update the portcontextRESTORE_CONTEXT macro to restore memory protection context */
+.macro portcontextRESTORE_CONTEXT
+    portasmRESTORE_MEMORY_PROTECTION_CONTEXT
+.endm