diff --git a/firmware/fw_common.S b/firmware/fw_common.S
index 9963fdd9..afe14a1b 100644
--- a/firmware/fw_common.S
+++ b/firmware/fw_common.S
@@ -121,6 +121,8 @@ _wait_for_boot_hart:
 
 _start_warm:
 	/* Disable and clear all interrupts */
+	csrw	mideleg, zero
+	csrw	medeleg, zero
 	csrw	mie, zero
 	csrw	mip, zero