diff --git a/frontend/src/types/TabSections.ts b/frontend/src/types/TabSections.ts
index 2496d3da8..ef49919bc 100644
--- a/frontend/src/types/TabSections.ts
+++ b/frontend/src/types/TabSections.ts
@@ -6,7 +6,7 @@ enum TabSections {
   ServiceTokens = "service-tokens"
 }
 
-const isTabSection = (value: any): boolean => {
+const isTabSection = (value: any): value is TabSections => {
   return Object.values(TabSections).includes(value);
 }
 
diff --git a/frontend/src/views/Org/MembersPage/MembersPage.tsx b/frontend/src/views/Org/MembersPage/MembersPage.tsx
index 94009caf7..b2916ce56 100644
--- a/frontend/src/views/Org/MembersPage/MembersPage.tsx
+++ b/frontend/src/views/Org/MembersPage/MembersPage.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
+
 import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
 import { withPermission } from "@app/hoc";
@@ -17,7 +18,7 @@ export const MembersPage = withPermission(
 
     useEffect(() => {
       if (selectedTab && isTabSection(selectedTab)) {
-        setActiveTab(selectedTab as TabSections);
+        setActiveTab(selectedTab);
       }
     }, [isTabSection, selectedTab]);
 
diff --git a/frontend/src/views/Project/MembersPage/MembersPage.tsx b/frontend/src/views/Project/MembersPage/MembersPage.tsx
index 877c0ebbd..818f1304c 100644
--- a/frontend/src/views/Project/MembersPage/MembersPage.tsx
+++ b/frontend/src/views/Project/MembersPage/MembersPage.tsx
@@ -1,13 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
+
 import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 import { withProjectPermission } from "@app/hoc";
+import { TabSections, isTabSection } from '@app/types';
 
 import { IdentityTab, MembersTab,ProjectRoleListTab, ServiceTokenTab } from "./components";
 
-import { TabSections, isTabSection } from '@app/types';
 
 export const MembersPage = withProjectPermission(
   () => {
@@ -18,7 +19,7 @@ export const MembersPage = withProjectPermission(
 
     useEffect(() => {
       if (selectedTab && isTabSection(selectedTab)) {
-        setActiveTab(selectedTab as TabSections);
+        setActiveTab(selectedTab);
       }
     }, [isTabSection, selectedTab]);