diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index cf7035edf1c..d4c24342d7b 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -6743,8 +6743,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
 			ctx.abi.load_patch_vertices_in = load_patch_vertices_in;
 		} else if (shaders[i]->info.stage == MESA_SHADER_VERTEX) {
 			if (shader_info->info.vs.needs_instance_id) {
-				if (ctx.ac.chip_class == GFX9 &&
-				    shaders[shader_count - 1]->info.stage == MESA_SHADER_TESS_CTRL) {
+				if (ctx.options->key.vs.as_ls) {
 					ctx.shader_info->vs.vgpr_comp_cnt =
 						MAX2(2, ctx.shader_info->vs.vgpr_comp_cnt);
 				} else {