diff --git a/src/compiler/nir/nir_lower_non_uniform_access.c b/src/compiler/nir/nir_lower_non_uniform_access.c
index a5b1bce4d4e..08dcaaae497 100644
--- a/src/compiler/nir/nir_lower_non_uniform_access.c
+++ b/src/compiler/nir/nir_lower_non_uniform_access.c
@@ -142,6 +142,9 @@ lower_non_uniform_tex_access(nir_builder *b, nir_tex_instr *tex)
    nir_builder_instr_insert(b, &tex->instr);
    nir_jump(b, nir_jump_break);
 
+   tex->texture_non_uniform = false;
+   tex->sampler_non_uniform = false;
+
    return true;
 }
 
@@ -170,6 +173,8 @@ lower_non_uniform_access_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
    nir_builder_instr_insert(b, &intrin->instr);
    nir_jump(b, nir_jump_break);
 
+   nir_intrinsic_set_access(intrin, nir_intrinsic_access(intrin) & ~ACCESS_NON_UNIFORM);
+
    return true;
 }