Fix to ensure we don't repeatedly finish the response when in polling mode