diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c
index 7ea8306e85d..5eee8ec0f01 100644
--- a/src/broadcom/vulkan/v3dv_pipeline.c
+++ b/src/broadcom/vulkan/v3dv_pipeline.c
@@ -1848,11 +1848,12 @@ pipeline_compile_fragment_shader(struct v3dv_pipeline *pipeline,
       pipeline->stages[BROADCOM_SHADER_VERTEX];
    struct v3dv_pipeline_stage *p_stage_fs =
       pipeline->stages[BROADCOM_SHADER_FRAGMENT];
+   struct v3dv_pipeline_stage *p_stage_gs =
+      pipeline->stages[BROADCOM_SHADER_GEOMETRY];
 
    struct v3d_fs_key key;
-
    pipeline_populate_v3d_fs_key(&key, pCreateInfo, p_stage_fs,
-                                pipeline->stages[BROADCOM_SHADER_GEOMETRY] != NULL,
+                                p_stage_gs != NULL,
                                 get_ucp_enable_mask(p_stage_vs));
 
    VkResult vk_result;