Breakthrough - Out of Combat zone kill timer doesn't reset in new HQ

After the second set of comms were destroyed on liberation peak, I was outside of the zone ahead of where I should have been trying to push the defenders out. Whenever the defenders were pushed out, I had the out of combat zone return timer on my screen and counting down, and even though the HQ updated to be a zone I was in the timer did not reset and I was killed with no chance to be revived. Even trying to leave and reenter the new HQ zone did not reset the timer.