diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index a211570d128..1ce6bb00b40 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -8755,9 +8755,7 @@ radv_get_needed_dynamic_states(struct radv_cmd_buffer *cmd_buffer)
 
    /* Clear unnecessary dynamic states for shader objects. */
    if (!cmd_buffer->state.shaders[MESA_SHADER_TESS_CTRL])
-      dynamic_states &= ~RADV_DYNAMIC_PATCH_CONTROL_POINTS;
-   if (!cmd_buffer->state.shaders[MESA_SHADER_TESS_EVAL])
-      dynamic_states &= ~RADV_DYNAMIC_TESS_DOMAIN_ORIGIN;
+      dynamic_states &= ~(RADV_DYNAMIC_PATCH_CONTROL_POINTS | RADV_DYNAMIC_TESS_DOMAIN_ORIGIN);
 
    if (cmd_buffer->device->physical_device->rad_info.gfx_level < GFX10_3)
       dynamic_states &= ~RADV_DYNAMIC_FRAGMENT_SHADING_RATE;