diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 8c4324437ad..9d7ab7bf68b 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7363,6 +7363,8 @@ static void si_get_vs_prolog_key(const struct tgsi_shader_info *info,
 
 	if (shader_out->selector->type == PIPE_SHADER_TESS_CTRL)
 		key->vs_prolog.num_merged_next_stage_vgprs = 2;
+	else if (shader_out->selector->type == PIPE_SHADER_GEOMETRY)
+		key->vs_prolog.num_merged_next_stage_vgprs = 5;
 
 	/* Set the instanceID flag. */
 	for (unsigned i = 0; i < info->num_inputs; i++)