diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 7c489ba13d0..8c307078c33 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -236,7 +236,10 @@ enum radv_ud_index {
    AC_UD_TCS_OFFCHIP_LAYOUT = AC_UD_VS_MAX_UD,
    AC_UD_TCS_EPILOG_PC,
    AC_UD_TCS_MAX_UD,
-   AC_UD_TES_STATE = AC_UD_SHADER_START,
+   /* We might not know the previous stage when compiling a geometry shader, so we just
+    * declare both TES and VS user SGPRs.
+    */
+   AC_UD_TES_STATE = AC_UD_VS_MAX_UD,
    AC_UD_TES_MAX_UD,
    AC_UD_MAX_UD = AC_UD_CS_MAX_UD,
 };