diff --git a/client/src/pages/Tasks/TaskDetail/index.tsx b/client/src/pages/Tasks/TaskDetail/index.tsx
index 29308d242e73d70c36ca8ba9668ff868b7bb45f0..d49d84d1e36e98db26315b602215034fbd56e1d7 100644
--- a/client/src/pages/Tasks/TaskDetail/index.tsx
+++ b/client/src/pages/Tasks/TaskDetail/index.tsx
@@ -49,7 +49,7 @@ export default function TaskDetail() {
             });
             getTaskAssignees(taskId).then(setAssignees);
             setAssignment(task.assigned.find(a => a.user === userId))
-        }).catch(() => history.goBack());
+        }).catch(() => {});
     }, [taskId, userId, history]);
 
     if (task) {
diff --git a/client/src/pages/Teams/index.tsx b/client/src/pages/Teams/index.tsx
index c292e100565f16fb5a77f959f7fb621a0b423cf8..445190902be222fd0686990c28e0abcf9af2eab3 100644
--- a/client/src/pages/Teams/index.tsx
+++ b/client/src/pages/Teams/index.tsx
@@ -30,20 +30,19 @@ export default function Teams() {
     const { teamId: teamParamId } = useParams<Params>();
     const lastTeam = sessionStorage.getItem('last-selected-team');
     const teamId = teamParamId ?? lastTeam ?? teams?.[0]?.id
-    sessionStorage.setItem('last-selected-team', teamId);
+    if (teamId) {
+        sessionStorage.setItem('last-selected-team', teamId);
+    }
 
     let currentTeam = teams?.find(team => team.id === teamId);
 
     useEffect(() => {
-        if (teams && (!currentTeam || !teamParamId)) {
-            if (teams.length > 0) {
-                // if no team is defined, take the first one
-                history.replace('/teams/' + teamId);
-            } else {
-                history.push('/introduction');
-            }
+        if (teamId && !teamParamId) {
+            history.replace('/teams/' + teamId);
+        } else if (teams && teams.length === 0) {
+            history.push('/introduction');
         }
-    });
+    }, [teamId, teamParamId, teams, history]);
 
     useEffect(() => {
         getTeams().then(setTeams);