diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
index 062f4a7a0f6..7fcb1a0ff5d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -3406,7 +3406,7 @@ nvir_nir_shader_compiler_options(int chipset)
       .lower_unpack_unorm_4x8 = true,
       .lower_unpack_snorm_4x8 = true,
       .lower_pack_split = false,
-      .lower_extract_byte = true,
+      .lower_extract_byte = (chipset < NVISA_GM107_CHIPSET),
       .lower_extract_word = true,
       .lower_all_io_to_temps = false,
       .lower_all_io_to_elements = false,