diff --git a/.pick_status.json b/.pick_status.json
index 6bd2bb7f849..86be6f30cfb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2084,7 +2084,7 @@
         "description": "panfrost: fix assertion failure compiling image conversion shaders",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "59a3e12039cde5df1451193557512b38cea0039e",
         "notes": null
diff --git a/src/gallium/drivers/panfrost/pan_mod_conv_cso.c b/src/gallium/drivers/panfrost/pan_mod_conv_cso.c
index 025fd4a7890..1619432640a 100644
--- a/src/gallium/drivers/panfrost/pan_mod_conv_cso.c
+++ b/src/gallium/drivers/panfrost/pan_mod_conv_cso.c
@@ -472,6 +472,9 @@ panfrost_get_mod_convert_shaders(struct panfrost_context *ctx,
       nir_shader *nir =                                                        \
          panfrost_create_##name##_shader(screen, __VA_ARGS__);            \
       nir->info.num_ubos = 1;                                                  \
+      /* "default" UBO is maybe not correct here, but in panfrost we're */     \
+      /* using this as an indicator for whether UBO0 is a user UBO */          \
+      nir->info.first_ubo_is_default_ubo = true;                               \
       shader->name##_cso = pipe_shader_from_nir(pctx, nir);                    \
    }