diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
index 6ed220c5b51..b0d7ab63c57 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
@@ -170,7 +170,7 @@ const TeamDetailsV1 = ({
     TitleBreadcrumbProps['titleLinks']
   >([]);
   const [addAttribute, setAddAttribute] = useState<AddAttribute>();
-  const [loading, setLoading] = useState<boolean>(true);
+  const [loading, setLoading] = useState<boolean>(false);
   const [selectedEntity, setEntity] = useState<{
     attribute: 'defaultRoles' | 'policies';
     record: EntityReference;
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 2e63d380e86..6cb9e6c24db 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -275,6 +275,7 @@
     "data-insight-chart": "Data insight chart",
     "data-assets": "Data Assets",
     "app-analytics": "App Analytics",
+    "no-team-found": "No team found.",
     "quality": "Quality",
     "insight": "Insight",
     "govern": "Govern"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx
index 6c9d72437a0..66a422ec775 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx
@@ -36,7 +36,6 @@ import {
   ResourceEntity,
 } from '../../components/PermissionProvider/PermissionProvider.interface';
 import TeamDetailsV1 from '../../components/TeamDetails/TeamDetailsV1';
-import Teams from '../../components/TeamDetails/Teams';
 import {
   INITIAL_PAGING_VALUE,
   LIST_SIZE,
@@ -216,8 +215,9 @@ const TeamsPage = () => {
       }
     } catch (error) {
       showErrorToast(error as AxiosError, t('server.unexpected-response'));
+    } finally {
+      setIsPageLoading(false);
     }
-    setIsPageLoading(false);
   };
 
   /**
@@ -545,69 +545,59 @@ const TeamsPage = () => {
     return <Loader />;
   }
 
-  return (
+  return entityPermissions.ViewAll || entityPermissions.ViewBasic ? (
     <>
-      {entityPermissions.ViewAll || entityPermissions.ViewBasic ? (
-        <>
-          {isUndefined(fqn) ? (
-            <Teams
-              data={allTeam}
-              showDeletedTeam={showDeletedTeam}
-              onAddTeamClick={handleAddTeam}
-              onShowDeletedTeamChange={handleShowDeletedTeam}
-              onTeamExpand={fetchAllTeams}
-            />
-          ) : (
-            <TeamDetailsV1
-              afterDeleteAction={afterDeleteAction}
-              assets={assets}
-              childTeams={allTeam}
-              currentTeam={selectedTeam}
-              currentTeamUserPage={currentUserPage}
-              currentTeamUsers={users}
-              descriptionHandler={descriptionHandler}
-              handleAddTeam={handleAddTeam}
-              handleAddUser={handleAddUsers}
-              handleCurrentUserPage={handleCurrentUserPage}
-              handleJoinTeamClick={handleJoinTeamClick}
-              handleLeaveTeamClick={handleLeaveTeamClick}
-              handleTeamUsersSearchAction={handleUsersSearchAction}
-              hasAccess={isAuthDisabled || isAdminUser}
-              isDescriptionEditable={isDescriptionEditable}
-              isTeamMemberLoading={isDataLoading}
-              removeUserFromTeam={removeUserFromTeam}
-              showDeletedTeam={showDeletedTeam}
-              teamUserPagin={userPaging}
-              teamUserPaginHandler={userPagingHandler}
-              teamUsersSearchText={userSearchValue}
-              updateTeamHandler={updateTeamHandler}
-              onAssetsPaginate={handleAssetsPaginate}
-              onDescriptionUpdate={onDescriptionUpdate}
-              onShowDeletedTeamChange={handleShowDeletedTeam}
-              onTeamExpand={fetchAllTeams}
-            />
-          )}
-
-          {isAddingUsers && (
-            <AddUsersModalV1
-              header={`Adding new users to ${getEntityName(selectedTeam)}`}
-              isVisible={isAddingUsers}
-              list={selectedTeam.users || []}
-              onCancel={() => setIsAddingUsers(false)}
-              onSave={(data) => addUsersToTeam(data)}
-            />
-          )}
-          <AddTeamForm
-            isLoading={isLoading}
-            visible={isAddingTeam}
-            onCancel={() => setIsAddingTeam(false)}
-            onSave={(data) => createNewTeam(data as Team)}
-          />
-        </>
+      {isEmpty(selectedTeam) ? (
+        <ErrorPlaceHolder>{t('label.no-team-found')}</ErrorPlaceHolder>
       ) : (
-        <ErrorPlaceHolder>{NO_PERMISSION_TO_VIEW}</ErrorPlaceHolder>
+        <TeamDetailsV1
+          afterDeleteAction={afterDeleteAction}
+          assets={assets}
+          childTeams={allTeam}
+          currentTeam={selectedTeam}
+          currentTeamUserPage={currentUserPage}
+          currentTeamUsers={users}
+          descriptionHandler={descriptionHandler}
+          handleAddTeam={handleAddTeam}
+          handleAddUser={handleAddUsers}
+          handleCurrentUserPage={handleCurrentUserPage}
+          handleJoinTeamClick={handleJoinTeamClick}
+          handleLeaveTeamClick={handleLeaveTeamClick}
+          handleTeamUsersSearchAction={handleUsersSearchAction}
+          hasAccess={isAuthDisabled || isAdminUser}
+          isDescriptionEditable={isDescriptionEditable}
+          isTeamMemberLoading={isDataLoading}
+          removeUserFromTeam={removeUserFromTeam}
+          showDeletedTeam={showDeletedTeam}
+          teamUserPagin={userPaging}
+          teamUserPaginHandler={userPagingHandler}
+          teamUsersSearchText={userSearchValue}
+          updateTeamHandler={updateTeamHandler}
+          onAssetsPaginate={handleAssetsPaginate}
+          onDescriptionUpdate={onDescriptionUpdate}
+          onShowDeletedTeamChange={handleShowDeletedTeam}
+          onTeamExpand={fetchAllTeams}
+        />
       )}
+
+      {isAddingUsers && (
+        <AddUsersModalV1
+          header={`Adding new users to ${getEntityName(selectedTeam)}`}
+          isVisible={isAddingUsers}
+          list={selectedTeam.users || []}
+          onCancel={() => setIsAddingUsers(false)}
+          onSave={(data) => addUsersToTeam(data)}
+        />
+      )}
+      <AddTeamForm
+        isLoading={isLoading}
+        visible={isAddingTeam}
+        onCancel={() => setIsAddingTeam(false)}
+        onSave={(data) => createNewTeam(data as Team)}
+      />
     </>
+  ) : (
+    <ErrorPlaceHolder>{NO_PERMISSION_TO_VIEW}</ErrorPlaceHolder>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/router/GlobalSettingRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/router/GlobalSettingRouter.tsx
index 86de8ae99b5..3099c882fd9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/router/GlobalSettingRouter.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/router/GlobalSettingRouter.tsx
@@ -91,14 +91,6 @@ const GlobalSettingRouter = () => {
       <Route exact path={getSettingPath()}>
         <Redirect to={getTeamsWithFqnPath(TeamType.Organization)} />
       </Route>
-      <Route
-        exact
-        component={TeamsPage}
-        path={getSettingPath(
-          GlobalSettingsMenuCategory.MEMBERS,
-          GlobalSettingOptions.TEAMS
-        )}
-      />
       <Route
         exact
         component={TeamsPage}
@@ -108,6 +100,13 @@ const GlobalSettingRouter = () => {
           true
         )}
       />
+      <Route
+        path={getSettingPath(
+          GlobalSettingsMenuCategory.MEMBERS,
+          GlobalSettingOptions.TEAMS
+        )}>
+        <Redirect to={getTeamsWithFqnPath(TeamType.Organization)} />
+      </Route>
       {/* Roles route start
        * Do not change the order of these route
        */}