diff --git a/bootrom/rbootrom.S b/bootrom/rbootrom.S
index 45c08fd..04454d8 100644
--- a/bootrom/rbootrom.S
+++ b/bootrom/rbootrom.S
@@ -22,6 +22,10 @@
 .globl _start
 _start:
 	jal print_hello		// Print initial message on HART 0 only
+
+	la t0, _hang
+	csrw mtvec, t0		// Set the machine trap vector
+
 	csrr a0, mhartid	// Load HART ID into a0
 	li s0, DRAM_BASE	// Load next address into s0
 	jr s0			// Jump to s0