diff --git a/pages/teams/index.tsx b/pages/teams/index.tsx
index 5ce648c..15e521a 100644
--- a/pages/teams/index.tsx
+++ b/pages/teams/index.tsx
@@ -34,6 +34,7 @@ function RouteHandler() {
             "not authenticated...routing from dashboard to teams home"
           );
           router.push("/teams/login");
+          return;
         }
 
         // get user
@@ -50,6 +51,7 @@ function RouteHandler() {
         ) {
           console.log("no profile for the user, routing him/her there");
           router.push("/teams/profile");
+          return;
         }
         setUser(returnedUser);
 
@@ -82,6 +84,7 @@ function RouteHandler() {
 
         if (invitedTeamMember.length > 0) {
           router.push("/teams/" + invitedTeamMember[0].teamId);
+          return;
         }
 
         setLoading(false);
diff --git a/pages/teams/profile.tsx b/pages/teams/profile.tsx
index 089b894..00a8dc7 100644
--- a/pages/teams/profile.tsx
+++ b/pages/teams/profile.tsx
@@ -46,6 +46,7 @@ export default function Profile() {
           returnedUser.firstName ?? currUser.displayName.split(" ")[0]
         );
         setLastName(returnedUser.lastName ?? "");
+        setTeamRole(returnedUser.teamRole ?? "");
       } catch (error) {
         console.log(error);
         router.push("/teams/login");