diff --git a/webapp/src/pages/welcome/welcomePage.tsx b/webapp/src/pages/welcome/welcomePage.tsx
index 2e5a280f1..bf758e317 100644
--- a/webapp/src/pages/welcome/welcomePage.tsx
+++ b/webapp/src/pages/welcome/welcomePage.tsx
@@ -48,8 +48,11 @@ const WelcomePage = () => {
             history.replace(queryString.get('r')!)
             return
         }
-
-        history.replace(`/team/${currentTeam?.id}`)
+        if (currentTeam) {
+            history.replace(`/team/${currentTeam?.id}`)
+        } else {
+            history.replace('/')
+        }
     }
 
     const skipTour = async () => {