diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c
index 6b69378b7a6..0172513d46e 100644
--- a/src/compiler/nir/nir_lower_io_to_scalar.c
+++ b/src/compiler/nir/nir_lower_io_to_scalar.c
@@ -260,7 +260,8 @@ nir_lower_io_to_scalar_instr(nir_builder *b, nir_instr *instr, void *data)
    }
 
    if ((intr->intrinsic == nir_intrinsic_load_output ||
-        intr->intrinsic == nir_intrinsic_load_per_vertex_output) &&
+        intr->intrinsic == nir_intrinsic_load_per_vertex_output ||
+        intr->intrinsic == nir_intrinsic_load_per_primitive_output) &&
        (state->mask & nir_var_shader_out) &&
        (!state->filter || state->filter(instr, state->filter_data))) {
       lower_load_input_to_scalar(b, intr);
@@ -277,7 +278,8 @@ nir_lower_io_to_scalar_instr(nir_builder *b, nir_instr *instr, void *data)
    }
 
    if ((intr->intrinsic == nir_intrinsic_store_output ||
-        intr->intrinsic == nir_intrinsic_store_per_vertex_output) &&
+        intr->intrinsic == nir_intrinsic_store_per_vertex_output ||
+        intr->intrinsic == nir_intrinsic_store_per_primitive_output) &&
        state->mask & nir_var_shader_out &&
        (!state->filter || state->filter(instr, state->filter_data))) {
       lower_store_output_to_scalar(b, intr);