diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
index 9a77a88c6fd..4bf2e2798dc 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
@@ -2578,7 +2578,8 @@ panvk_per_arch(cmd_flush_draws)(struct panvk_cmd_buffer *cmdbuf)
 
       /* We inherited the render context, and need to let the primary command
        * buffer know that it's changed. */
-      cmdbuf->state.gfx.render.invalidate_inherited_ctx = true;
+      cmdbuf->state.gfx.render.invalidate_inherited_ctx =
+         inherits_render_ctx(cmdbuf);
 
       /* Re-emit the FB/Tiler descs if we inherited them. */
       if (inherits_render_ctx(cmdbuf))