[WiP] Make scalable

**Do not merge.**
Should we add a metric and a log line here to see when this happens?