diff --git a/artiq/firmware/runtime/Makefile b/artiq/firmware/runtime/Makefile
index a98ccc312..5fa6dbdf8 100644
--- a/artiq/firmware/runtime/Makefile
+++ b/artiq/firmware/runtime/Makefile
@@ -8,7 +8,7 @@ CFLAGS += \
 LDFLAGS += \
 	-L../libunwind
 
-RUSTFLAGS += -Cpanic=abort
+RUSTFLAGS += -Cpanic=unwind
 
 all:: runtime.bin runtime.fbi