diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 77feab78ede..c2b806c2530 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -427,7 +427,6 @@ gather_info_output_decl_gs(const nir_shader *nir, const nir_variable *var,
 
    assert(stream < 4);
 
-   info->gs.max_stream = MAX2(info->gs.max_stream, stream);
    info->gs.num_stream_output_components[stream] += num_components;
    info->gs.output_streams[idx] = stream;
 }
@@ -694,6 +693,8 @@ radv_nir_shader_info_pass(struct radv_device *device, const struct nir_shader *n
       info->gs.vertices_out = nir->info.gs.vertices_out;
       info->gs.output_prim = nir->info.gs.output_primitive;
       info->gs.invocations = nir->info.gs.invocations;
+      info->gs.max_stream =
+         nir->info.gs.active_stream_mask ? util_last_bit(nir->info.gs.active_stream_mask) - 1 : 0;
       break;
    case MESA_SHADER_TESS_EVAL:
       info->tes._primitive_mode = nir->info.tess._primitive_mode;