I thought there was a patch way early in D2 where this was fixed but it's still happening. Sometimes it's before my ship even touches down and I'm still circling the planet, but it also varies on whether I actually get anything for "completing" the match.