diff --git a/src/back/spv/instructions.rs b/src/back/spv/instructions.rs
index 82af2d35f1..f8366b96c5 100644
--- a/src/back/spv/instructions.rs
+++ b/src/back/spv/instructions.rs
@@ -552,6 +552,20 @@ impl super::Instruction {
         instruction
     }
 
+    pub(super) fn image_fetch(
+        result_type_id: Word,
+        id: Word,
+        image: Word,
+        coordinates: Word,
+    ) -> Self {
+        let mut instruction = Self::new(Op::ImageFetch);
+        instruction.set_type(result_type_id);
+        instruction.set_result(id);
+        instruction.add_operand(image);
+        instruction.add_operand(coordinates);
+        instruction
+    }
+
     pub(super) fn image_read(
         result_type_id: Word,
         id: Word,
diff --git a/src/back/spv/writer.rs b/src/back/spv/writer.rs
index 984f01fabc..189876b003 100644
--- a/src/back/spv/writer.rs
+++ b/src/back/spv/writer.rs
@@ -1601,19 +1601,26 @@ impl Writer {
                 )?;
 
                 let id = self.generate_id();
-                let mut instruction =
-                    Instruction::image_read(result_type_id, id, image_id, coordinate_id);
+
+                let image_ty = self.typifier.get(image, &ir_module.types);
+                let mut instruction = match *image_ty {
+                    crate::TypeInner::Image {
+                        class: crate::ImageClass::Storage { .. },
+                        ..
+                    } => Instruction::image_read(result_type_id, id, image_id, coordinate_id),
+                    _ => Instruction::image_fetch(result_type_id, id, image_id, coordinate_id),
+                };
 
                 if let Some(index) = index {
-                    let index_id =
-                        self.write_expression(ir_module, ir_function, index, block, function)?;
-                    let image_ops = match *self.typifier.get(image, &ir_module.types) {
+                    let image_ops = match *image_ty {
                         crate::TypeInner::Image {
                             class: crate::ImageClass::Sampled { multi: true, .. },
                             ..
                         } => spirv::ImageOperands::SAMPLE,
                         _ => spirv::ImageOperands::LOD,
                     };
+                    let index_id =
+                        self.write_expression(ir_module, ir_function, index, block, function)?;
                     instruction.add_operand(image_ops.bits());
                     instruction.add_operand(index_id);
                 }