diff --git a/controller.sv b/controller.sv
index c30433bb..8fca11ea 100644
--- a/controller.sv
+++ b/controller.sv
@@ -404,7 +404,7 @@ module riscv_controller
               pc_set_o      = 1'b1;
               exc_ack_o     = 1'b1;
 
-              exc_save_id_o = 1'b1;
+              exc_save_if_o = 1'b1;
 
               // we don't have to change our current state here as the prefetch
               // buffer is automatically invalidated, thus the next instruction
@@ -474,7 +474,6 @@ module riscv_controller
               pc_mux_o      = PC_EXCEPTION;
               pc_set_o      = 1'b1;
               exc_ack_o     = 1'b1;
-              halt_id_o     = 1'b1; // we don't want to propagate this instruction to EX
               exc_save_if_o = 1'b1;
               // we don't have to change our current state here as the prefetch
               // buffer is automatically invalidated, thus the next instruction
@@ -534,8 +533,6 @@ module riscv_controller
               pc_mux_o      = PC_EXCEPTION;
               pc_set_o      = 1'b1;
               exc_ack_o     = 1'b1;
-
-              halt_id_o     = 1'b1; // we don't want to propagate this instruction to EX
               exc_save_id_o = 1'b1;
 
               // we don't have to change our current state here as the prefetch