diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
index 2a99c8f5238..8d252f216a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
@@ -60,22 +60,6 @@ const TeamsPage = () => {
   const [isAddingTeam, setIsAddingTeam] = useState<boolean>(false);
   const [isAddingUsers, setIsAddingUsers] = useState<boolean>(false);
   const [userList, setUserList] = useState<Array<User>>([]);
-  const fetchCurrentTeam = (name: string, update = false) => {
-    if (currentTeam?.name !== name || update) {
-      setIsLoading(true);
-      getTeamByName(name, ['users', 'owns'])
-        .then((res: AxiosResponse) => {
-          setCurrentTeam(res.data);
-          setIsLoading(false);
-        })
-        .catch((err: AxiosError) => {
-          if (err?.response?.data.code) {
-            setError(ERROR404);
-          }
-          setIsLoading(false);
-        });
-    }
-  };
 
   const fetchTeams = () => {
     setIsLoading(true);
@@ -85,27 +69,46 @@ const TeamsPage = () => {
           setCurrentTeam(res.data.data[0]);
         }
         setTeams(res.data.data);
-        setIsLoading(false);
       })
       .catch((err: AxiosError) => {
         if (err?.response?.data.code) {
           setError(ERROR404);
         }
+      })
+      .finally(() => {
         setIsLoading(false);
       });
   };
 
+  const fetchCurrentTeam = (name: string, update = false) => {
+    if (currentTeam?.name !== name || update) {
+      setIsLoading(true);
+      getTeamByName(name, ['users', 'owns'])
+        .then((res: AxiosResponse) => {
+          setCurrentTeam(res.data);
+          if (teams.length <= 0) {
+            fetchTeams();
+          }
+        })
+        .catch((err: AxiosError) => {
+          if (err?.response?.data.code) {
+            setError(ERROR404);
+          }
+        })
+        .finally(() => {
+          setIsLoading(false);
+        });
+    }
+  };
+
   const createNewTeam = (data: Team) => {
     createTeam(data)
       .then((res: AxiosResponse) => {
         if (res.data) {
           fetchTeams();
-          setIsAddingTeam(false);
-        } else {
-          setIsAddingTeam(false);
         }
       })
-      .catch(() => {
+      .finally(() => {
         setIsAddingTeam(false);
       });
   };