Garmin Fenix 6x ends lap when pausing Pool Swim activity

Just been for a pool swim and had to pause my swim (by pressing the start/stop button) during a 500m set, because the lifeguards were moving the lane ropes around and I had to wait at the end of the lane. My Garmin has ended my lap at the point I paused the activity. Is there anyway to set my watch so that it does not do this, so it just pauses the activity when I press the start/stop button and restarts it as the same lap when I start it again? I use the lap button to record the end of my sets/laps so don't need the start/stop button to do this too.