diff --git a/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx b/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx
index e49449166..a3bc3bddb 100644
--- a/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx
+++ b/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx
@@ -14,7 +14,7 @@ import { WebsiteSelect } from '@/components/input/WebsiteSelect';
 export function BoardEditHeader() {
   const { board, updateBoard, saveBoard, isPending } = useBoard();
   const { formatMessage, labels } = useMessages();
-  const { router, renderUrl } = useNavigation();
+  const { teamId, router, renderUrl } = useNavigation();
   const defaultName = formatMessage(labels.untitled);
 
   const handleNameChange = (value: string) => {
@@ -81,7 +81,11 @@ export function BoardEditHeader() {
         </Row>
         <Row alignItems="center" gap="3">
           <Text>{formatMessage(labels.website)}</Text>
-          <WebsiteSelect websiteId={board?.parameters?.websiteId} onChange={handleWebsiteChange} />
+          <WebsiteSelect
+            websiteId={board?.parameters?.websiteId}
+            teamId={teamId}
+            onChange={handleWebsiteChange}
+          />
         </Row>
       </Column>
       <Column justifyContent="center" alignItems="flex-end">
diff --git a/src/app/api/websites/[websiteId]/reports/route.ts b/src/app/api/websites/[websiteId]/reports/route.ts
index 93e7ab468..0e4e404ec 100644
--- a/src/app/api/websites/[websiteId]/reports/route.ts
+++ b/src/app/api/websites/[websiteId]/reports/route.ts
@@ -1,17 +1,16 @@
 import { z } from 'zod';
 import { parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { filterParams, pagingParams } from '@/lib/schema';
+import { pagingParams, reportTypeParam } from '@/lib/schema';
 import { canViewWebsite } from '@/permissions';
 import { getReports } from '@/queries/prisma';
 
 export async function GET(
   request: Request,
   { params }: { params: Promise<{ websiteId: string }> },
-  filters: { type: string },
 ) {
   const schema = z.object({
-    ...filterParams,
+    type: reportTypeParam.optional(),
     ...pagingParams,
   });
 
@@ -22,7 +21,7 @@ export async function GET(
   }
 
   const { websiteId } = await params;
-  const { page, pageSize, search } = query;
+  const { type, page, pageSize, search } = query;
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
@@ -32,7 +31,7 @@ export async function GET(
     {
       where: {
         websiteId,
-        type: filters.type,
+        type,
       },
     },
     {