Hey Steve,
this is a frequently reported issue. The answer is here and here.
You don’t have to modify your g-code program or CAM software settings. The Onefinity controller is able to do the right things on tool change, unfortunately the Onefinity CNC is delivered with a “tool-change” setting that is unusable. The remedy is linked above.