diff --git a/stm-firmware/safety/fault.c b/stm-firmware/safety/fault.c
index 86d8b8b..37fe8f6 100644
--- a/stm-firmware/safety/fault.c
+++ b/stm-firmware/safety/fault.c
@@ -36,6 +36,12 @@ void HardFault_Handler(void)
 	while (1);
 }
 
+/* Overwrite default handler. Go to panic mode */
+void __int_default_handler(void)
+{
+	panic_mode();
+}
+
 void panic_mode(void)
 {
 	static struct safety_memory_boot_status IN_SECTION(.ccm.bss) boot_status;