diff --git a/wally-pipelined/src/ifu/ifu.sv b/wally-pipelined/src/ifu/ifu.sv
index 935279049..68e0873f3 100644
--- a/wally-pipelined/src/ifu/ifu.sv
+++ b/wally-pipelined/src/ifu/ifu.sv
@@ -153,8 +153,10 @@ module ifu (
 	  STATE_SPILL_SPILL: begin
 		SelSpill = 1;
 		if(ICacheStallF | BusStall) begin
-		  NextState = STATE_SPILL_SPILL;
 		  SelNextSpill = 1;
+		end
+		if(ICacheStallF | BusStall | StallF) begin
+		  NextState = STATE_SPILL_SPILL;
 		end else begin
 		  NextState = STATE_SPILL_READY;
 		end