diff --git a/arch/x86_64/src/intel64/intel64_handlers.c b/arch/x86_64/src/intel64/intel64_handlers.c
index 24a04574f7..af30b1a1df 100644
--- a/arch/x86_64/src/intel64/intel64_handlers.c
+++ b/arch/x86_64/src/intel64/intel64_handlers.c
@@ -67,8 +67,6 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
   struct tcb_s **running_task = &g_running_tasks[this_cpu()];
   struct tcb_s *tcb;
 
-  (*running_task)->xcp.regs = regs;
-
   /* Current regs non-zero indicates that we are processing an interrupt;
    * g_current_regs is also used to manage interrupt level context switches.
    *
@@ -126,14 +124,8 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
   /* Clear irq flag */
 
   up_set_interrupt_context(false);
-  regs = tcb->xcp.regs;
 
-  /* (*running_task)->xcp.regs is about to become invalid
-   * and will be marked as NULL to avoid misusage.
-   */
-
-  (*running_task)->xcp.regs = NULL;
-  return regs;
+  return tcb->xcp.regs;
 }
 #endif