diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 322143d1e7b..a277c0eef31 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -504,8 +504,9 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
       (nir_var_shader_in | nir_var_shader_out | nir_var_function_temp );
    nir_remove_dead_variables(nir, mask);
 
-   NIR_PASS_V(nir, nir_lower_atomics_to_ssbo,
-              st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers);
+   if (!st->has_hw_atomics)
+      NIR_PASS_V(nir, nir_lower_atomics_to_ssbo,
+                 st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers);
 
    st_finalize_nir_before_variants(nir);