diff --git a/client/src/pages/diagnostic/DiagnosticsAccessTab.tsx b/client/src/pages/diagnostic/DiagnosticsAccessTab.tsx
index 4f4ec2242..8a405d52b 100644
--- a/client/src/pages/diagnostic/DiagnosticsAccessTab.tsx
+++ b/client/src/pages/diagnostic/DiagnosticsAccessTab.tsx
@@ -32,12 +32,14 @@ export default function DiagnosticsAccessTab() {
   const { response: permsRes } = useGet<PermissionsResponse>(
     "/me/permissions",
     {},
-    { refreshInterval: config.GLOBAL_REFRESH }
+    { refreshInterval: config.GLOBAL_REFRESH },
+    { useTeamIdAsKey: true }
   );
   const { response: entsRes } = useGet<{ message: string; data: Entitlements }>(
     "/me/entitlements",
     {},
-    { refreshInterval: config.GLOBAL_REFRESH }
+    { refreshInterval: config.GLOBAL_REFRESH },
+    { useTeamIdAsKey: true }
   );
 
   const orgPerms = permsRes?.data?.org || [];
diff --git a/client/src/pages/diagnostic/DiagnosticsConfigTab.tsx b/client/src/pages/diagnostic/DiagnosticsConfigTab.tsx
index d3bc1fd66..8118a5e45 100644
--- a/client/src/pages/diagnostic/DiagnosticsConfigTab.tsx
+++ b/client/src/pages/diagnostic/DiagnosticsConfigTab.tsx
@@ -4,7 +4,6 @@ import Divider from "@mui/material/Divider";
 import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import { useGet } from "@/hooks/UseApi";
-import { StatBox } from "@/components/design-elements";
 import { config as clientConfig } from "@/config";
 
 type EnvConfig = {
@@ -35,8 +34,6 @@ export default function DiagnosticsConfigTab() {
 
   if (!data && !loading && !error) return null;
 
-  const totalKeys = data ? Object.keys(data).length : 0;
-
   return (
     <Stack spacing={theme.spacing(8)}>
       {data && (
diff --git a/client/src/pages/notification-channels/NotificationChannels.tsx b/client/src/pages/notification-channels/NotificationChannels.tsx
index 7dde5a2a1..15ac4d5a6 100644
--- a/client/src/pages/notification-channels/NotificationChannels.tsx
+++ b/client/src/pages/notification-channels/NotificationChannels.tsx
@@ -14,6 +14,7 @@ import type { INotificationChannel } from "@/types/notification-channel";
 import { useGet, usePatch, useDelete } from "@/hooks/UseApi";
 import type { ApiResponse } from "@/hooks/UseApi";
 import { useTranslation } from "react-i18next";
+import { config } from "@/config/index";
 
 const NotificationChannelsPage = () => {
   const { t } = useTranslation();
@@ -25,7 +26,16 @@ const NotificationChannelsPage = () => {
 
   const { response, isValidating, error, refetch } = useGet<
     ApiResponse<INotificationChannel[]>
-  >("/notification-channels", {}, {});
+  >(
+    "/notification-channels",
+    {},
+    {
+      refreshInterval: config.GLOBAL_REFRESH,
+      keepPreviousData: true,
+      dedupingInterval: 0,
+    },
+    { useTeamIdAsKey: true }
+  );
 
   const { patch, loading: pausing } = usePatch<{}, INotificationChannel>();
   const { deleteFn, loading: isDeleting } =