Fix #12 and prevent LWC messages when using shop