diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
index 9047aa0ea80..e417f5dc058 100644
--- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c
+++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
@@ -65,7 +65,15 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b, un
       /* Atomic counters are now SSBOs so memoryBarrierAtomicCounter() is now
        * memoryBarrierBuffer().
        */
-      instr->intrinsic = nir_intrinsic_memory_barrier_buffer;
+      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;
+      }
       return true;
 
    case nir_intrinsic_atomic_counter_inc: