diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs
index 0a1e3113d8..fa3c7263f1 100644
--- a/src/front/spv/mod.rs
+++ b/src/front/spv/mod.rs
@@ -1478,9 +1478,11 @@ impl<I: Iterator<Item = u32>> Parser<I> {
                 }
                 Op::ImageWrite => {
                     let extra = inst.expect_at_least(4)?;
+                    block.extend(emitter.finish(expressions));
                     let stmt =
                         self.parse_image_write(extra, type_arena, global_arena, expressions)?;
                     block.push(stmt);
+                    emitter.start(expressions);
                 }
                 Op::ImageFetch | Op::ImageRead => {
                     let extra = inst.expect_at_least(5)?;