diff --git a/apps/studio/.github/eslint-rule-baselines.json b/apps/studio/.github/eslint-rule-baselines.json
index 8ce74e19536..37f87aa30ff 100644
--- a/apps/studio/.github/eslint-rule-baselines.json
+++ b/apps/studio/.github/eslint-rule-baselines.json
@@ -1,9 +1,9 @@
 {
   "rules": {
-    "react-hooks/exhaustive-deps": 175,
+    "react-hooks/exhaustive-deps": 174,
     "import/no-anonymous-default-export": 57,
-    "@tanstack/query/exhaustive-deps": 12,
-    "@typescript-eslint/no-explicit-any": 983,
+    "@tanstack/query/exhaustive-deps": 9,
+    "@typescript-eslint/no-explicit-any": 968,
     "no-restricted-imports": 0,
     "no-restricted-exports": 240,
     "react/no-unstable-nested-components": 47
@@ -65,7 +65,7 @@
       "components/interfaces/SQLEditor/MonacoEditor.tsx": 1,
       "components/interfaces/SQLEditor/MoveQueryModal.tsx": 1,
       "components/interfaces/SQLEditor/OngoingQueriesPanel.tsx": 1,
-      "components/interfaces/SQLEditor/SQLEditor.tsx": 3,
+      "components/interfaces/SQLEditor/SQLEditor.tsx": 2,
       "components/interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx": 1,
       "components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx": 1,
       "components/interfaces/Settings/Addons/IPv4SidePanel.tsx": 1,
@@ -123,6 +123,7 @@
       "hooks/misc/useSchemaQueryState.ts": 1,
       "hooks/misc/useTrackExperimentExposure.ts": 1,
       "hooks/misc/useUpgradePrompt.tsx": 1,
+      "lib/telemetry/track.ts": 1,
       "pages/forgot-password-mfa.tsx": 1,
       "pages/integrations/vercel/[slug]/deploy-button/new-project.tsx": 1,
       "pages/integrations/vercel/install.tsx": 1,
@@ -134,7 +135,6 @@
       "pages/project/[ref]/settings/jwt/legacy.tsx": 1,
       "pages/project/[ref]/sql/examples.tsx": 1,
       "pages/project/[ref]/sql/templates.tsx": 1,
-      "pages/sign-in-mfa.tsx": 1,
       "state/role-impersonation-state.tsx": 1,
       "state/sidebar-manager-state.tsx": 1,
       "state/table-editor-table.tsx": 1
@@ -199,16 +199,13 @@
       "pages/api/v1/projects/[ref]/types/typescript.ts": 1
     },
     "@tanstack/query/exhaustive-deps": {
-      "components/interfaces/Reports/SharedAPIReport/SharedAPIReport.constants.ts": 1,
       "components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx": 1,
       "components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx": 2,
       "data/branches/branch-diff-query.ts": 1,
       "data/database/foreign-key-constraints-query.ts": 1,
       "data/database/schemas-query.ts": 1,
       "data/entity-types/entity-types-infinite-query.ts": 1,
-      "data/tables/tables-query.ts": 2,
-      "hooks/analytics/useDbQuery.tsx": 1,
-      "hooks/analytics/useSingleLog.tsx": 1
+      "data/tables/tables-query.ts": 2
     },
     "@typescript-eslint/no-explicit-any": {
       "components/grid/SupabaseGrid.tsx": 1,
@@ -235,7 +232,6 @@
       "components/interfaces/Auth/AuthProvidersForm/index.tsx": 7,
       "components/interfaces/Auth/AuthProvidersFormValidation.tsx": 2,
       "components/interfaces/Auth/BasicAuthSettingsForm.tsx": 1,
-      "components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx": 1,
       "components/interfaces/Auth/Overview/OverviewTable.tsx": 1,
       "components/interfaces/Auth/Overview/OverviewUsage.constants.ts": 1,
       "components/interfaces/Auth/PerformanceSettingsForm.tsx": 2,
@@ -250,7 +246,7 @@
       "components/interfaces/Auth/RedirectUrls/RedirectUrlList.tsx": 1,
       "components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx": 2,
       "components/interfaces/Auth/SiteUrl/SiteUrl.tsx": 1,
-      "components/interfaces/Auth/SmtpForm/SmtpForm.tsx": 3,
+      "components/interfaces/Auth/SmtpForm/SmtpForm.tsx": 2,
       "components/interfaces/Auth/Users/UserLogs.tsx": 1,
       "components/interfaces/Auth/Users/UserPanel.tsx": 1,
       "components/interfaces/Auth/Users/Users.utils.tsx": 5,
@@ -436,11 +432,8 @@
       "components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ForeignKeysManagement/ForeignKeyRow.tsx": 1,
       "components/interfaces/TableGridEditor/TableDefinition.tsx": 3,
       "components/interfaces/TableGridEditor/TableEntity.utils.ts": 1,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx": 2,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/ResponseCompletedBlock.tsx": 1,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsx": 4,
+      "components/interfaces/UnifiedLogs/ServiceFlow/components/PostgresFlowDetail.tsx": 2,
       "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsx": 4,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TimelineStep.tsx": 1,
       "components/interfaces/UnifiedLogs/ServiceFlow/config/fieldHelpers.ts": 3,
       "components/interfaces/UnifiedLogs/ServiceFlow/types.ts": 10,
       "components/interfaces/UnifiedLogs/ServiceFlow/utils/storageUtils.ts": 3,
@@ -590,7 +583,6 @@
       "hooks/misc/withAuth.tsx": 1,
       "hooks/ui/useClickedOutside.ts": 2,
       "hooks/ui/useFlag.ts": 1,
-      "hooks/useStaticEffectEvent.ts": 1,
       "instrumentation-client.ts": 3,
       "lib/ai/generate-assistant-response.ts": 2,
       "lib/ai/model.ts": 2,