diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 4296c59ee8c..7f72ec97cf0 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -570,12 +570,8 @@ gather_shader_info_vs(struct radv_device *device, const nir_shader *nir,
       info->esgs_itemsize = radv_compute_esgs_itemsize(pdev->info.gfx_level, info->vs.num_linked_outputs);
    }
 
-   if (info->is_ngg) {
-      info->vs.num_outputs = nir->num_outputs;
-
-      if (info->next_stage == MESA_SHADER_FRAGMENT || info->next_stage == MESA_SHADER_NONE) {
-         gather_shader_info_ngg_query(device, info);
-      }
+   if (info->is_ngg && (info->next_stage == MESA_SHADER_FRAGMENT || info->next_stage == MESA_SHADER_NONE)) {
+      gather_shader_info_ngg_query(device, info);
    }
 }
 
@@ -636,12 +632,8 @@ gather_shader_info_tes(struct radv_device *device, const nir_shader *nir, struct
       info->esgs_itemsize = radv_compute_esgs_itemsize(pdev->info.gfx_level, info->tes.num_linked_outputs);
    }
 
-   if (info->is_ngg) {
-      info->tes.num_outputs = nir->num_outputs;
-
-      if (info->next_stage == MESA_SHADER_FRAGMENT || info->next_stage == MESA_SHADER_NONE) {
-         gather_shader_info_ngg_query(device, info);
-      }
+   if (info->is_ngg && (info->next_stage == MESA_SHADER_FRAGMENT || info->next_stage == MESA_SHADER_NONE)) {
+      gather_shader_info_ngg_query(device, info);
    }
 }
 
diff --git a/src/amd/vulkan/radv_shader_info.h b/src/amd/vulkan/radv_shader_info.h
index c7feea6fd42..dfe10568220 100644
--- a/src/amd/vulkan/radv_shader_info.h
+++ b/src/amd/vulkan/radv_shader_info.h
@@ -124,7 +124,6 @@ struct radv_shader_info {
       uint64_t tcs_inputs_via_lds;
       uint32_t vb_desc_usage_mask;
       uint32_t input_slot_usage_mask;
-      uint32_t num_outputs; /* For NGG streamout only */
       uint8_t num_linked_outputs;
       uint8_t num_attributes;
       bool needs_draw_id : 1;
@@ -151,7 +150,6 @@ struct radv_shader_info {
    } gs;
    struct {
       uint32_t tcs_vertices_out;
-      uint32_t num_outputs;            /* For NGG streamout only */
       uint8_t num_linked_inputs;       /* Number of reserved per-vertex input slots in VRAM. */
       uint8_t num_linked_patch_inputs; /* Number of reserved per-patch input slots in VRAM. */
       uint8_t num_linked_outputs;