[CR] Coffee shop fix

Not tested yet, but someone had to fix #8910 at some point.