diff --git i/src/amd/vulkan/radv_pipeline.c w/src/amd/vulkan/radv_pipeline.c
index 9d5da43532f..3bb1d3c3d70 100644
--- i/src/amd/vulkan/radv_pipeline.c
+++ w/src/amd/vulkan/radv_pipeline.c
@@ -3453,6 +3453,9 @@ radv_compute_ia_multi_vgt_param_helpers(struct radv_pipeline *pipeline,
 		ia_multi_vgt_param.partial_vs_wave = true;
 	}
 
+	ia_multi_vgt_param.partial_vs_wave = true;
+	ia_multi_vgt_param.wd_switch_on_eop = true;
+
 	ia_multi_vgt_param.base =
 		S_028AA8_PRIMGROUP_SIZE(ia_multi_vgt_param.primgroup_size - 1) |
 		/* The following field was moved to VGT_SHADER_STAGES_EN in GFX9. */