diff --git a/webapp/src/app.tsx b/webapp/src/app.tsx
index 145be4d59..34d49e9a1 100644
--- a/webapp/src/app.tsx
+++ b/webapp/src/app.tsx
@@ -145,6 +145,33 @@ const App = React.memo((): JSX.Element => {
{globalErrorRedirect}
+ {
+ Utils.isFocalboardPlugin() &&
+ {
+ if (loggedIn === false) {
+ return
+ }
+
+ if (continueToWelcomeScreen()) {
+ return
+ }
+
+ if (Utils.isFocalboardPlugin() && UserSettings.lastWorkspaceId) {
+ return
+ }
+
+ if (loggedIn === true) {
+ return
+ }
+
+ return null
+ }}
+ />
+ }
+