diff --git a/tinygrad/codegen/__init__.py b/tinygrad/codegen/__init__.py
index 5a4e19d357..7758adac74 100644
--- a/tinygrad/codegen/__init__.py
+++ b/tinygrad/codegen/__init__.py
@@ -19,13 +19,13 @@ from tinygrad.codegen.late.control_flow import CFGContext, pm_add_ends, pm_split
 def full_rewrite_to_sink(sink:UOp, ren:Renderer|None=None, optimize:bool=True) -> UOp:
   if ren is None: ren = Renderer()
 
-  # TODO: fix expander remove this
-  sink = graph_rewrite(sink, pm_add_buffers_local, name="add locals early")
-
   # first we optimize
   if optimize:
     if QUANTIZE and ren.device in {"CPU", "DSP"}: sink = graph_rewrite(sink, pm_quant, name="quantize")
 
+    # TODO: fix expander and remove this
+    sink = graph_rewrite(sink, pm_add_buffers_local, name="add locals early")
+
     # split ranges
     sink = graph_rewrite(sink, pm_split_ranges+pm_flatten_range, ctx={}, name="split ranges")