diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
index f470c476250..c2367017f43 100644
--- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c
+++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
@@ -59,15 +59,11 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b, un
       /* Atomic counters are now SSBOs so memoryBarrierAtomicCounter() is now
        * memoryBarrierBuffer().
        */
-      if (b->shader->options->use_scoped_barrier) {
-         instr->intrinsic = nir_intrinsic_scoped_barrier;
-         nir_intrinsic_set_execution_scope(instr, NIR_SCOPE_NONE);
-         nir_intrinsic_set_memory_scope(instr, NIR_SCOPE_DEVICE);
-         nir_intrinsic_set_memory_semantics(instr, NIR_MEMORY_ACQ_REL);
-         nir_intrinsic_set_memory_modes(instr, nir_var_mem_ssbo);
-      } else {
-         instr->intrinsic = nir_intrinsic_memory_barrier_buffer;
-      }
+      instr->intrinsic = nir_intrinsic_scoped_barrier;
+      nir_intrinsic_set_execution_scope(instr, NIR_SCOPE_NONE);
+      nir_intrinsic_set_memory_scope(instr, NIR_SCOPE_DEVICE);
+      nir_intrinsic_set_memory_semantics(instr, NIR_MEMORY_ACQ_REL);
+      nir_intrinsic_set_memory_modes(instr, nir_var_mem_ssbo);
       return true;
 
    case nir_intrinsic_atomic_counter_inc:
diff --git a/src/compiler/nir/nir_lower_variable_initializers.c b/src/compiler/nir/nir_lower_variable_initializers.c
index fd212538c29..1100d828211 100644
--- a/src/compiler/nir/nir_lower_variable_initializers.c
+++ b/src/compiler/nir/nir_lower_variable_initializers.c
@@ -191,12 +191,8 @@ nir_zero_initialize_shared_memory(nir_shader *shader,
    }
    nir_pop_loop(&b, loop);
 
-   if (shader->options->use_scoped_barrier) {
-      nir_scoped_barrier(&b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_WORKGROUP,
-                         NIR_MEMORY_ACQ_REL, nir_var_mem_shared);
-   } else {
-      nir_memory_barrier_shared(&b);
-   }
+   nir_scoped_barrier(&b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_WORKGROUP,
+                      NIR_MEMORY_ACQ_REL, nir_var_mem_shared);
 
    nir_metadata_preserve(nir_shader_get_entrypoint(shader), nir_metadata_none);