diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 2445df96d1b..881a5345db7 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6314,6 +6314,16 @@ iris_upload_dirty_render_state(struct iris_context *ice,
    struct iris_screen *screen = batch->screen;
    struct iris_border_color_pool *border_color_pool =
       iris_bufmgr_get_border_color_pool(screen->bufmgr);
+
+   /* Re-emit 3DSTATE_DS before any 3DPRIMITIVE when tessellation is on */
+   /* FIXME: WA framework doesn't know about 14019750404 yet.
+    * if (intel_needs_workaround(batch->screen->devinfo, 14019750404) &&
+    *     ice->shaders.prog[MESA_SHADER_TESS_EVAL])
+    */
+   if (batch->screen->devinfo->has_mesh_shading &&
+       ice->shaders.prog[MESA_SHADER_TESS_EVAL])
+      ice->state.stage_dirty |= IRIS_STAGE_DIRTY_TES;
+
    const uint64_t dirty = ice->state.dirty;
    const uint64_t stage_dirty = ice->state.stage_dirty;