I am facing the exact same issue - I feel like I am missing something in the way I setup my app OAuth flow and like Plutonian has mentioned, conditionally using the App Bridge Provider seems a bit clunky...