diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
index 8a34c3de2a..f20ee65e83 100644
--- a/apps/web/pages/event-types/index.tsx
+++ b/apps/web/pages/event-types/index.tsx
@@ -861,7 +861,7 @@ const EventTypesPage = () => {
   const filters = getTeamsFiltersFromQuery(router.query);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer as any, { filters });
+  const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer as any, filters && { filters });
 
   return (
     <div>
diff --git a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts
index dfc69ea896..14d71c9d78 100644
--- a/packages/features/filters/lib/getTeamsFiltersFromQuery.ts
+++ b/packages/features/filters/lib/getTeamsFiltersFromQuery.ts
@@ -24,5 +24,10 @@ export const getTeamsFiltersFromQuery = (query: ParsedUrlQuery) => {
   // [1,2] is equivalent to [2,1] when fetching filter data.
   filters.teamIds = filters.teamIds?.sort();
   filters.userIds = filters.userIds?.sort();
+
+  if (!filters.teamIds?.length && !filters.userIds?.length) {
+    return undefined;
+  }
+
   return filters;
 };