diff --git a/cpukit/score/cpu/riscv/riscv-context-initialize.c b/cpukit/score/cpu/riscv/riscv-context-initialize.c
index 619c691f53..f558fbd591 100644
--- a/cpukit/score/cpu/riscv/riscv-context-initialize.c
+++ b/cpukit/score/cpu/riscv/riscv-context-initialize.c
@@ -32,11 +32,8 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include <rtems/score/cpu.h>
 #include <rtems/score/riscv-utility.h>
-#include <rtems/score/interr.h>
 
 void _CPU_Context_Initialize(
   Context_Control *context,
@@ -52,8 +49,6 @@ void _CPU_Context_Initialize(
 
   uintptr_t stack_high = stack + stack_area_size;
 
-  memset(context, 0, sizeof(*context));
-
   /* Stack Pointer - sp/x2 */
   context->x[2] = stack_high;
   /* Frame Pointer - fp/x8 */
@@ -61,6 +56,8 @@ void _CPU_Context_Initialize(
   /* Return Address - ra/x1 */
   context->x[1] = (uintptr_t) entry_point;
 
+  context->isr_dispatch_disable = 0;
+
   /* Enable interrupts and FP */
   context->mstatus = MSTATUS_FS | MSTATUS_MIE;
 }