diff --git a/packages/core/components/NoSSR.tsx b/packages/core/components/NoSSR.tsx
new file mode 100644
index 0000000000..1163e0483c
--- /dev/null
+++ b/packages/core/components/NoSSR.tsx
@@ -0,0 +1,20 @@
+import { useState, useEffect } from "react";
+
+interface Props {
+ children: React.ReactNode; // React.ReactNode
+ fallback?: JSX.Element | null; // JSX.Element
+}
+
+const NoSSR = ({ children, fallback = null }: Props) => {
+ const [mounted, setMounted] = useState(false);
+
+ useEffect(() => setMounted(true), []);
+
+ if (!mounted) {
+ return fallback;
+ }
+
+ return <>{children}>;
+};
+
+export default NoSSR;
diff --git a/packages/features/flags/pages/flag-listing-view.tsx b/packages/features/flags/pages/flag-listing-view.tsx
index 4b633299ed..a649d0bf5d 100644
--- a/packages/features/flags/pages/flag-listing-view.tsx
+++ b/packages/features/flags/pages/flag-listing-view.tsx
@@ -1,5 +1,6 @@
import { Suspense } from "react";
+import NoSSR from "@calcom/core/components/NoSSR";
import { Meta } from "@calcom/ui";
import { FiLoader } from "@calcom/ui/components/icon";
@@ -9,9 +10,11 @@ export const FlagListingView = () => {
return (
<>
- }>
-
-
+
+ }>
+
+
+
>
);
};
diff --git a/packages/trpc/react/trpc.ts b/packages/trpc/react/trpc.ts
index 5c5c1d3e11..065aa7d8aa 100644
--- a/packages/trpc/react/trpc.ts
+++ b/packages/trpc/react/trpc.ts
@@ -23,7 +23,7 @@ export const trpc = createTRPCNext