diff --git a/packages/features/flags/hooks/index.ts b/packages/features/flags/hooks/index.ts
index 6786ce9038..4b8ca934fb 100644
--- a/packages/features/flags/hooks/index.ts
+++ b/packages/features/flags/hooks/index.ts
@@ -1,10 +1,12 @@
+import type { AppFlags } from "@calcom/features/flags/config";
 import { trpc } from "@calcom/trpc/react";
 
 export function useFlags() {
   const query = trpc.viewer.features.map.useQuery(undefined, {
     initialData: process.env.NEXT_PUBLIC_IS_E2E
       ? { "managed-event-types": true, organizations: true, teams: true }
-      : {},
+      : undefined,
+    placeholderData: {},
   });
-  return query.data;
+  return query.data ?? ({} as AppFlags);
 }