diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 7f723b699a4..18a47b0854e 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -28,6 +28,29 @@
 #include "pan_context.h"
 #include "pan_job.h"
 
+void
+panfrost_emit_shader_meta(struct panfrost_batch *batch,
+                          enum pipe_shader_type st,
+                          struct midgard_payload_vertex_tiler *vtp)
+{
+        struct panfrost_context *ctx = batch->ctx;
+        struct panfrost_shader_state *ss = panfrost_get_shader_state(ctx, st);
+
+        if (!ss) {
+                vtp->postfix.shader = 0;
+                return;
+        }
+
+        /* Add the shader BO to the batch. */
+        panfrost_batch_add_bo(batch, ss->bo,
+                              PAN_BO_ACCESS_PRIVATE |
+                              PAN_BO_ACCESS_READ |
+                              panfrost_bo_access_for_stage(st));
+
+        vtp->postfix.shader = panfrost_upload_transient(batch, ss->tripipe,
+                                                        sizeof(*ss->tripipe));
+}
+
 static void
 panfrost_mali_viewport_init(struct panfrost_context *ctx,
                             struct mali_viewport *mvp)
diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.h b/src/gallium/drivers/panfrost/pan_cmdstream.h
index 8ad9a8282d7..326e4b2efe5 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.h
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.h
@@ -32,6 +32,11 @@
 
 #include "pan_job.h"
 
+void
+panfrost_emit_shader_meta(struct panfrost_batch *batch,
+                          enum pipe_shader_type st,
+                          struct midgard_payload_vertex_tiler *vtp);
+
 void
 panfrost_emit_viewport(struct panfrost_batch *batch,
                        struct midgard_payload_vertex_tiler *tp);
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index a79da05603f..1f595919faa 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -538,10 +538,8 @@ panfrost_patch_shader_state(struct panfrost_context *ctx,
 {
         struct panfrost_shader_state *ss = panfrost_get_shader_state(ctx, stage);
 
-        if (!ss) {
-                ctx->payloads[stage].postfix.shader = 0;
+        if (!ss)
                 return;
-        }
 
         ss->tripipe->texture_count = ctx->sampler_view_count[stage];
         ss->tripipe->sampler_count = ctx->sampler_count[stage];
@@ -550,18 +548,6 @@ panfrost_patch_shader_state(struct panfrost_context *ctx,
 
         unsigned ubo_count = panfrost_ubo_count(ctx, stage);
         ss->tripipe->midgard1.uniform_buffer_count = ubo_count;
-
-        struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx);
-
-        /* Add the shader BO to the batch. */
-        panfrost_batch_add_bo(batch, ss->bo,
-                              PAN_BO_ACCESS_PRIVATE |
-                              PAN_BO_ACCESS_READ |
-			      panfrost_bo_access_for_stage(stage));
-
-        ctx->payloads[stage].postfix.shader = panfrost_upload_transient(batch,
-                                        ss->tripipe,
-                                        sizeof(struct mali_shader_meta));
 }
 
 /* Go through dirty flags and actualise them in the cmdstream. */
@@ -601,7 +587,11 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data)
         }
 
         panfrost_patch_shader_state(ctx, PIPE_SHADER_VERTEX);
+        panfrost_emit_shader_meta(batch, PIPE_SHADER_VERTEX,
+                                  &ctx->payloads[PIPE_SHADER_VERTEX]);
         panfrost_patch_shader_state(ctx, PIPE_SHADER_COMPUTE);
+        panfrost_emit_shader_meta(batch, PIPE_SHADER_COMPUTE,
+                                  &ctx->payloads[PIPE_SHADER_COMPUTE]);
 
         if (ctx->shader[PIPE_SHADER_VERTEX] && ctx->shader[PIPE_SHADER_FRAGMENT]) {
                 /* Check if we need to link the gl_PointSize varying */