diff --git a/src/app/dashboard/terminal/page.tsx b/src/app/dashboard/terminal/page.tsx
index 431bc1a7b..5c70803fc 100644
--- a/src/app/dashboard/terminal/page.tsx
+++ b/src/app/dashboard/terminal/page.tsx
@@ -206,6 +206,7 @@ async function isTerminalTemplateAvailable({
 
   const defaultTemplatesRepository = createDefaultTemplatesRepository({
     accessToken,
+    teamId,
   })
   const teamTemplatesRepository = createTemplatesRepository({
     accessToken,
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 9d282af3e..4fee26982 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -15,10 +15,7 @@ import {
 } from '@/core/modules/users/auth-user-emails.server'
 import { api, infra } from '@/core/shared/clients/api'
 import { repoErrorFromHttp } from '@/core/shared/errors'
-import type {
-  RequestScope,
-  TeamRequestScope,
-} from '@/core/shared/repository-scope'
+import type { TeamRequestScope } from '@/core/shared/repository-scope'
 import { err, ok, type RepoResult } from '@/core/shared/result'
 
 type TemplatesRepositoryDeps = {
@@ -142,7 +139,7 @@ export function createTemplatesRepository(
 }
 
 export function createDefaultTemplatesRepository(
-  scope: RequestScope,
+  scope: TeamRequestScope,
   deps: Pick<TemplatesRepositoryDeps, 'apiClient' | 'authHeaders'> = {
     apiClient: api,
     authHeaders: SUPABASE_AUTH_HEADERS,
@@ -159,7 +156,7 @@ export function createDefaultTemplatesRepository(
       const { data, error, response } = await deps.apiClient.GET(
         '/templates/defaults',
         {
-          headers: deps.authHeaders(scope.accessToken),
+          headers: deps.authHeaders(scope.accessToken, scope.teamId),
           next: { tags: [CACHE_TAGS.DEFAULT_TEMPLATES] },
         }
       )
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index d063c251c..ce1756bdc 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -5,18 +5,12 @@ import {
   createTemplatesRepository,
 } from '@/core/modules/templates/repository.server'
 import { throwTRPCErrorFromRepoError } from '@/core/server/adapters/errors'
-import {
-  withAuthedRequestRepository,
-  withTeamAuthedRequestRepository,
-} from '@/core/server/api/middlewares/repository'
+import { withTeamAuthedRequestRepository } from '@/core/server/api/middlewares/repository'
 import { createTRPCRouter } from '@/core/server/trpc/init'
-import {
-  protectedProcedure,
-  protectedTeamProcedure,
-} from '@/core/server/trpc/procedures'
+import { protectedTeamProcedure } from '@/core/server/trpc/procedures'
 
-const templatesRepositoryProcedure = protectedProcedure.use(
-  withAuthedRequestRepository(
+const templatesRepositoryProcedure = protectedTeamProcedure.use(
+  withTeamAuthedRequestRepository(
     createDefaultTemplatesRepository,
     (templatesRepository) => ({
       templatesRepository,
diff --git a/src/features/dashboard/templates/list/table.tsx b/src/features/dashboard/templates/list/table.tsx
index 922c195ef..0c153f44d 100644
--- a/src/features/dashboard/templates/list/table.tsx
+++ b/src/features/dashboard/templates/list/table.tsx
@@ -48,11 +48,14 @@ export default function TemplatesTable() {
   )
 
   const { data: defaultTemplatesData } = useSuspenseQuery(
-    trpc.templates.getDefaultTemplatesCached.queryOptions(undefined, {
-      refetchOnMount: false,
-      refetchOnWindowFocus: false,
-      refetchOnReconnect: false,
-    })
+    trpc.templates.getDefaultTemplatesCached.queryOptions(
+      { teamSlug },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: false,
+      }
+    )
   )
 
   const templates = useMemo(