Extra time added after selecting END ride or run

In most of my workouts (either riding or running), the time between selecting END and the stopping of the spinning wait animation seems to be included in the workout total. In my case, it sometimes takes almost a full minute for the summary screen to be displayed after hitting END. Messes up averages, especially on runs.

Using either iPad or Apple TV. My connection isn’t the greatest but don’t have any intermittent pauses during workouts.