diff --git a/src/arch/riscv64/interrupt/mod.rs b/src/arch/riscv64/interrupt/mod.rs
index 838b251aaa..edd113e5d4 100644
--- a/src/arch/riscv64/interrupt/mod.rs
+++ b/src/arch/riscv64/interrupt/mod.rs
@@ -7,6 +7,7 @@ mod exception;
 pub mod syscall;
 pub mod trace;
 
+pub use exception::exception_handler;
 pub use handler::InterruptStack;
 
 /// Clear interrupts
@@ -42,15 +43,3 @@ pub unsafe fn enable_and_nop() {
 pub unsafe fn halt() {
     unsafe { asm!("wfi", options(nomem, nostack)) }
 }
-
-#[inline(always)]
-pub unsafe fn init() {
-    unsafe {
-        // Setup interrupt handlers
-        asm!(
-            "la t0, {}", // WARL=0 - direct mode combined handler
-            "csrw stvec, t0",
-            sym exception::exception_handler,
-        );
-    }
-}
diff --git a/src/arch/riscv64/start.rs b/src/arch/riscv64/start.rs
index bbce183fe9..a74717b07c 100644
--- a/src/arch/riscv64/start.rs
+++ b/src/arch/riscv64/start.rs
@@ -14,6 +14,7 @@ use crate::{
     arch::{device::serial::init_early, interrupt, paging},
     device,
     devices::graphical_debug,
+    interrupt::exception_handler,
     startup::KernelArgs,
 };
 
@@ -60,6 +61,9 @@ global_asm!("
         auipc   sp, %pcrel_hi({stack}+{stack_size}-16)
         addi    sp, sp, %pcrel_lo(.Lpcrel_hi0)
 
+        la t0, {exception_handler} // WARL=0 - direct mode combined handler
+        csrw stvec, t0
+
         li ra, 0
         j {start}
 
@@ -68,6 +72,7 @@ global_asm!("
     ",
     bss_test_zero = sym BSS_TEST_ZERO,
     data_test_nonzero = sym DATA_TEST_NONZERO,
+    exception_handler = sym exception_handler,
     stack = sym STACK,
     stack_size = const size_of_val(&STACK),
     start = sym start,
@@ -102,8 +107,6 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
                 device::dump_fdt(&dtb);
             }
 
-            interrupt::init();
-
             // Initialize RMM
             crate::startup::memory::init(&args, None, None);