diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c
index 27a3384f5cd..297c95e90e5 100644
--- a/src/nouveau/compiler/nak_nir.c
+++ b/src/nouveau/compiler/nak_nir.c
@@ -1307,7 +1307,8 @@ nak_postprocess_nir(nir_shader *nir,
       UNREACHABLE("Unsupported shader stage");
    }
 
-   OPT(nir, nak_nir_lower_load_store, nak);
+   if (OPT(nir, nak_nir_lower_load_store, nak))
+      OPT(nir, nir_opt_constant_folding);
 
    struct nir_opt_offsets_options nak_offset_options = {
       .max_offset_cb = nak_nir_max_imm_offset,