diff --git a/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c b/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c
index 1496924f3a0..03922302a9e 100644
--- a/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c
+++ b/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c
@@ -9,7 +9,8 @@ bool si_nir_kill_outputs(nir_shader *nir, const union si_shader_key *key)
 {
    nir_function_impl *impl = nir_shader_get_entrypoint(nir);
    assert(impl);
-   assert(nir->info.stage <= MESA_SHADER_GEOMETRY);
+   assert(nir->info.stage <= MESA_SHADER_GEOMETRY ||
+          nir->info.stage == MESA_SHADER_MESH);
 
    if (!key->ge.opt.kill_outputs &&
        !key->ge.opt.kill_pointsize &&
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index fb7537c6ba4..af358321038 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1321,7 +1321,7 @@ static void run_pre_link_optimization_passes(struct si_nir_shader_ctx *ctx)
    bool progress = false;
 
    /* Kill outputs according to the shader key. */
-   if (nir->info.stage <= MESA_SHADER_GEOMETRY)
+   if (nir->info.stage <= MESA_SHADER_GEOMETRY || nir->info.stage == MESA_SHADER_MESH)
       NIR_PASS(progress, nir, si_nir_kill_outputs, key);
 
    bool inline_uniforms = false;