diff --git a/src/panfrost/compiler/bifrost/bifrost_compile.c b/src/panfrost/compiler/bifrost/bifrost_compile.c
index f828d3b4d60..7784ba6debb 100644
--- a/src/panfrost/compiler/bifrost/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost/bifrost_compile.c
@@ -5736,15 +5736,11 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust2_mode
    nir_load_store_vectorize_options vectorize_opts = {
       .modes = nir_var_mem_global |
                nir_var_mem_shared |
+               nir_var_mem_ubo |
                nir_var_shader_temp,
       .callback = mem_vectorize_cb,
       .robust_modes = robust2_modes,
    };
-
-   /* Only allow vectorization of UBOs when no robustness2 is configured */
-   if (!(robust2_modes & nir_var_mem_ubo))
-      vectorize_opts.modes |= nir_var_mem_ubo;
-
    NIR_PASS(_, nir, nir_opt_load_store_vectorize, &vectorize_opts);
 
    /* nir_lower_pack can generate split operations, execute algebraic again to