diff --git a/src/lsu.sv b/src/lsu.sv
index e719f2c68..a19d7587b 100644
--- a/src/lsu.sv
+++ b/src/lsu.sv
@@ -504,6 +504,9 @@ module lsu #(
         end else begin
             stall_n     = 1'b1;
         end
+        // if we flush we can safely un-stall
+        if (flush_i)
+            stall_n     = 1'b0;
     end
 
     // registers
diff --git a/src/store_queue.sv b/src/store_queue.sv
index adefcfd56..96729d614 100644
--- a/src/store_queue.sv
+++ b/src/store_queue.sv
@@ -143,8 +143,8 @@ module store_queue (
         end
 
         // when we flush evict the speculative store
-        if (flush_i & commit_queue_q.is_speculative) begin
-            commit_queue_n.valid          = 1'b0;
+        if (flush_i && commit_queue_q.is_speculative) begin
+            commit_queue_n.valid = 1'b0;
         end
 
     end