diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index abb790fee45..5b21454b06e 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -412,10 +412,7 @@ set_vs_specific_input_locs(struct radv_shader_args *args,
 					   user_sgpr_idx);
 		}
 
-		unsigned vs_num = 2;
-		if (args->shader_info->vs.needs_draw_id)
-			vs_num++;
-
+		unsigned vs_num = count_vs_user_sgprs(args) - args->shader_info->vs.has_vertex_buffers;
 		set_loc_shader(args, AC_UD_VS_BASE_VERTEX_START_INSTANCE,
 			       user_sgpr_idx, vs_num);
 	}