diff --git a/.pick_status.json b/.pick_status.json
index a5b53269bc1..40660090938 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -589,7 +589,7 @@
         "description": "gallium/ntt: Fix emitting UBO declarations.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "d70fff99c5bc3a721e20869e7f0be8024ffe5ecd"
     },
diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c
index 7d23ab08bce..35477e11e89 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c
@@ -258,8 +258,6 @@ ntt_setup_uniforms(struct ntt_compile *c)
                                                         var->data.image.format,
                                                         !var->data.read_only,
                                                         false);
-      } else if (var->data.mode == nir_var_mem_ubo) {
-         ureg_DECL_constant2D(c->ureg, 0, 0, var->data.driver_location + 1);
       } else {
          unsigned size;
          if (packed) {
@@ -274,6 +272,10 @@ ntt_setup_uniforms(struct ntt_compile *c)
       }
    }
 
+   nir_foreach_variable_with_modes(var, c->s, nir_var_mem_ubo) {
+      ureg_DECL_constant2D(c->ureg, 0, 0, var->data.driver_location + 1);
+   }
+
    for (int i = 0; i < PIPE_MAX_SAMPLERS; i++) {
       if (c->s->info.textures_used & (1 << i))
          ureg_DECL_sampler(c->ureg, i);