diff --git a/arch/riscv/core/isr.S b/arch/riscv/core/isr.S
index f96b0a642a3..2fd49656c00 100644
--- a/arch/riscv/core/isr.S
+++ b/arch/riscv/core/isr.S
@@ -91,6 +91,7 @@ GTEXT(z_riscv_thread_start)
 
 #ifdef CONFIG_TRACING
 GTEXT(sys_trace_isr_enter)
+GTEXT(sys_trace_isr_exit)
 #endif
 
 #ifdef CONFIG_USERSPACE
@@ -492,6 +493,10 @@ on_irq_stack:
 	/* Call ISR function */
 	jalr ra, t1, 0
 
+#ifdef CONFIG_TRACING_ISR
+    call sys_trace_isr_exit
+#endif
+
 irq_done:
 	/* Decrement _current_cpu->nested */
 	lw t2, ___cpu_t_nested_OFFSET(s0)