Multi Location Stock available when location is disabled of online fulfillment

Hi,

We have a warehouse and 8 stores, all using Shopify POS. There is a bug in Shopify meaning that the website displays stock from all 9 locations despite the store locations being disabled. This is causing us a lot of pain with resource required to address the cutomers and the negatives being caused in the warehouse location. Shopify are aware of it but have said it will be months until it is fixed.

Does anyone have the same issue and have any work arounds or short term solutions that may help?

Thanks

Ross