diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
index 42346567273..96a6ffab388 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
@@ -19,8 +19,12 @@ import { transformModelData } from "./utils/modelDataTransformer";
 import { all_admin_roles, internalUserRoles, isProxyAdminRole, isUserTeamAdminForAnyTeam } from "@/utils/roles";
 import { RefreshCcw } from "lucide-react";
 import { useQueryClient } from "@tanstack/react-query";
-// eslint-disable-next-line litellm-ui/no-banned-ui-imports
-import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@tremor/react";
+import {
+  Tabs,
+  TabsContent,
+  TabsList,
+  TabsTrigger,
+} from "@/components/ui/tabs";
 import { useForm } from "react-hook-form";
 import { PlusCircle as PlusCircleOutlined } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
@@ -69,7 +73,7 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
   const [showAdvancedSettings, setShowAdvancedSettings] = useState<boolean>(false);
   const [selectedModelId, setSelectedModelId] = useState<string | null>(null);
   const [selectedTeamId, setSelectedTeamId] = useState<string | null>(null);
-  const [selectedTabIndex, setSelectedTabIndex] = useState(0);
+  const [selectedTab, setSelectedTab] = useState<string>("all-models");
   const [showMissingProviderBanner, setShowMissingProviderBanner] = useState(() => {
     if (typeof window !== "undefined") {
       return localStorage.getItem("hideMissingProviderBanner") !== "true";
@@ -365,17 +369,39 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
               modelAccessGroups={availableModelAccessGroups}
             />
           ) : (
-            <TabGroup index={selectedTabIndex} onIndexChange={setSelectedTabIndex} className="gap-2 h-[75vh] w-full ">
-              <TabList className="flex justify-between mt-2 w-full items-center">
+            <Tabs
+              value={selectedTab}
+              onValueChange={setSelectedTab}
+              className="gap-2 h-[75vh] w-full"
+            >
+              <TabsList className="flex justify-between mt-2 w-full items-center bg-transparent p-0 h-auto">
                 <div className="flex">
-                  {all_admin_roles.includes(userRole) ? <Tab>All Models</Tab> : <Tab>Your Models</Tab>}
-                  {!shouldHideAddModelTab && <Tab>Add Model</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>LLM Credentials</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>Pass-Through Endpoints</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>Health Status</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>Model Retry Settings</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>Model Group Alias</Tab>}
-                  {all_admin_roles.includes(userRole) && <Tab>Price Data Reload</Tab>}
+                  {all_admin_roles.includes(userRole) ? (
+                    <TabsTrigger value="all-models">All Models</TabsTrigger>
+                  ) : (
+                    <TabsTrigger value="all-models">Your Models</TabsTrigger>
+                  )}
+                  {!shouldHideAddModelTab && (
+                    <TabsTrigger value="add-model">Add Model</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="llm-credentials">LLM Credentials</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="pass-through">Pass-Through Endpoints</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="health">Health Status</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="retry">Model Retry Settings</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="alias">Model Group Alias</TabsTrigger>
+                  )}
+                  {all_admin_roles.includes(userRole) && (
+                    <TabsTrigger value="price-data">Price Data Reload</TabsTrigger>
+                  )}
                 </div>
 
                 <div className="flex items-center space-x-2 self-center">
@@ -393,8 +419,8 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
                     <RefreshCcw className="h-3.5 w-3.5" />
                   </button>
                 </div>
-              </TabList>
-              <TabPanels>
+              </TabsList>
+              <TabsContent value="all-models">
                 <AllModelsTab
                   selectedModelGroup={selectedModelGroup}
                   setSelectedModelGroup={setSelectedModelGroup}
@@ -403,48 +429,50 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
                   setSelectedModelId={setSelectedModelId}
                   setSelectedTeamId={setSelectedTeamId}
                 />
-                {!shouldHideAddModelTab && (
-                  <TabPanel className="h-full">
-                    <AddModelTab
-                      form={addModelForm}
-                      handleOk={handleOk}
-                      selectedProvider={selectedProvider}
-                      setSelectedProvider={setSelectedProvider}
-                      providerModels={providerModels}
-                      setProviderModelsFn={setProviderModelsFn}
-                      getPlaceholder={getPlaceholder}
-                      uploadProps={uploadProps}
-                      showAdvancedSettings={showAdvancedSettings}
-                      setShowAdvancedSettings={setShowAdvancedSettings}
-                      teams={teams}
-                      credentials={credentialsList}
-                      accessToken={accessToken}
-                      userRole={userRole}
-                    />
-                  </TabPanel>
-                )}
-                <TabPanel>
-                  <CredentialsPanel uploadProps={uploadProps} />
-                </TabPanel>
-                <TabPanel>
-                  <PassThroughSettings
+              </TabsContent>
+              {!shouldHideAddModelTab && (
+                <TabsContent value="add-model" className="h-full">
+                  <AddModelTab
+                    form={addModelForm}
+                    handleOk={handleOk}
+                    selectedProvider={selectedProvider}
+                    setSelectedProvider={setSelectedProvider}
+                    providerModels={providerModels}
+                    setProviderModelsFn={setProviderModelsFn}
+                    getPlaceholder={getPlaceholder}
+                    uploadProps={uploadProps}
+                    showAdvancedSettings={showAdvancedSettings}
+                    setShowAdvancedSettings={setShowAdvancedSettings}
+                    teams={teams}
+                    credentials={credentialsList}
                     accessToken={accessToken}
                     userRole={userRole}
-                    userID={userID}
-                    modelData={processedModelData}
-                    premiumUser={premiumUser}
                   />
-                </TabPanel>
-                <TabPanel>
-                  <HealthCheckComponent
-                    accessToken={accessToken}
-                    modelData={processedModelData}
-                    all_models_on_proxy={allModelIdsOnProxy}
-                    getDisplayModelName={getDisplayModelName}
-                    setSelectedModelId={setSelectedModelId}
-                    teams={teams}
-                  />
-                </TabPanel>
+                </TabsContent>
+              )}
+              <TabsContent value="llm-credentials">
+                <CredentialsPanel uploadProps={uploadProps} />
+              </TabsContent>
+              <TabsContent value="pass-through">
+                <PassThroughSettings
+                  accessToken={accessToken}
+                  userRole={userRole}
+                  userID={userID}
+                  modelData={processedModelData}
+                  premiumUser={premiumUser}
+                />
+              </TabsContent>
+              <TabsContent value="health">
+                <HealthCheckComponent
+                  accessToken={accessToken}
+                  modelData={processedModelData}
+                  all_models_on_proxy={allModelIdsOnProxy}
+                  getDisplayModelName={getDisplayModelName}
+                  setSelectedModelId={setSelectedModelId}
+                  teams={teams}
+                />
+              </TabsContent>
+              <TabsContent value="retry">
                 <ModelRetrySettingsTab
                   selectedModelGroup={selectedModelGroup}
                   setSelectedModelGroup={setSelectedModelGroup}
@@ -456,16 +484,18 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
                   setModelGroupRetryPolicy={setModelGroupRetryPolicy}
                   handleSaveRetrySettings={handleSaveRetrySettings}
                 />
-                <TabPanel>
-                  <ModelGroupAliasSettings
-                    accessToken={accessToken}
-                    initialModelGroupAlias={modelGroupAlias}
-                    onAliasUpdate={setModelGroupAlias}
-                  />
-                </TabPanel>
+              </TabsContent>
+              <TabsContent value="alias">
+                <ModelGroupAliasSettings
+                  accessToken={accessToken}
+                  initialModelGroupAlias={modelGroupAlias}
+                  onAliasUpdate={setModelGroupAlias}
+                />
+              </TabsContent>
+              <TabsContent value="price-data">
                 <PriceDataManagementTab />
-              </TabPanels>
-            </TabGroup>
+              </TabsContent>
+            </Tabs>
           )}
         </div>
       </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
index 6191c2b3030..df0f133515a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
@@ -11,8 +11,6 @@ import { modelDeleteCall } from "@/components/networking";
 import { Info, Settings, Filter, RefreshCw, Search } from "lucide-react";
 import { PaginationState, SortingState } from "@tanstack/react-table";
 import { useQueryClient } from "@tanstack/react-query";
-// eslint-disable-next-line litellm-ui/no-banned-ui-imports
-import { TabPanel } from "@tremor/react";
 import { Button } from "@/components/ui/button";
 import {
   Select,
@@ -239,7 +237,7 @@ const AllModelsTab = ({
   };
 
   return (
-    <TabPanel>
+    <>
       <div>
         <div className="flex flex-col space-y-4">
           <div className="bg-background rounded-lg shadow">
@@ -563,7 +561,7 @@ const AllModelsTab = ({
         onCancel={() => setIsModelSettingsModalVisible(false)}
         onSuccess={() => setIsModelSettingsModalVisible(false)}
       />
-    </TabPanel>
+    </>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/ModelRetrySettingsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/ModelRetrySettingsTab.tsx
index dfd56a21ff7..43850b21dfc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/ModelRetrySettingsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/ModelRetrySettingsTab.tsx
@@ -7,8 +7,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-// eslint-disable-next-line litellm-ui/no-banned-ui-imports
-import { TabPanel } from "@tremor/react";
 import React from "react";
 
 interface GlobalRetryPolicyObject {
@@ -56,7 +54,7 @@ const ModelRetrySettingsTab = ({
   handleSaveRetrySettings,
 }: ModelRetrySettingsTabProps) => {
   return (
-    <TabPanel>
+    <>
       <div className="flex items-center gap-4 mb-6">
         <div className="flex items-center">
           <span>Retry Policy Scope:</span>
@@ -184,7 +182,7 @@ const ModelRetrySettingsTab = ({
       <Button className="mt-6 mr-8" onClick={handleSaveRetrySettings}>
         Save
       </Button>
-    </TabPanel>
+    </>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/PriceDataManagementTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/PriceDataManagementTab.tsx
index c3c4a5dd7e7..2388ae10cd0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/PriceDataManagementTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/PriceDataManagementTab.tsx
@@ -1,5 +1,3 @@
-// eslint-disable-next-line litellm-ui/no-banned-ui-imports
-import { TabPanel } from "@tremor/react";
 import PriceDataReload from "@/components/price_data_reload";
 import React from "react";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
@@ -10,7 +8,7 @@ const PriceDataManagementTab = () => {
   const { refetch: refetchModelCostMap } = useModelCostMap();
 
   return (
-    <TabPanel>
+    <>
       <div className="p-6">
         <div className="mb-6">
           <h2 className="text-lg font-semibold text-foreground">
@@ -31,7 +29,7 @@ const PriceDataManagementTab = () => {
           className="w-full"
         />
       </div>
-    </TabPanel>
+    </>
   );
 };