diff --git a/src/panfrost/lib/pan_shader.h b/src/panfrost/lib/pan_shader.h
index c31c35dfc6d..f5889ee66f0 100644
--- a/src/panfrost/lib/pan_shader.h
+++ b/src/panfrost/lib/pan_shader.h
@@ -147,6 +147,9 @@ pan_shader_prepare_bifrost_rsd(const struct panfrost_device *dev,
                         info->fs.reads_sample_mask_in |
                         info->fs.reads_helper_invocation |
                         info->fs.sample_shading;
+
+                rsd->message_preload_1 = info->bifrost.messages[0];
+                rsd->message_preload_2 = info->bifrost.messages[1];
                 break;
 
         case MESA_SHADER_COMPUTE:
diff --git a/src/panfrost/util/pan_ir.h b/src/panfrost/util/pan_ir.h
index f8fa8c0e165..910bacad5bf 100644
--- a/src/panfrost/util/pan_ir.h
+++ b/src/panfrost/util/pan_ir.h
@@ -151,6 +151,9 @@ struct bifrost_shader_info {
         struct bifrost_shader_blend_info blend[8];
         nir_alu_type blend_src1_type;
         bool wait_6, wait_7;
+
+        /* Packed, preloaded message descriptors */
+        uint16_t messages[2];
 };
 
 struct midgard_shader_info {