diff --git a/web/app/components/plugins/marketplace/hydration-client.tsx b/web/app/components/plugins/marketplace/hydration-client.tsx
index 8a2ab6f691..59507bed9f 100644
--- a/web/app/components/plugins/marketplace/hydration-client.tsx
+++ b/web/app/components/plugins/marketplace/hydration-client.tsx
@@ -8,7 +8,7 @@ export function HydrateClient({
   children,
 }: {
   isMarketplacePlatform?: boolean
-  children?: React.ReactNode
+  children: React.ReactNode
 }) {
   useHydrateAtoms([
     [isMarketplacePlatformAtom, isMarketplacePlatform],
diff --git a/web/app/components/plugins/marketplace/hydration-server.tsx b/web/app/components/plugins/marketplace/hydration-server.tsx
index c87a846c5c..acef5d5d20 100644
--- a/web/app/components/plugins/marketplace/hydration-server.tsx
+++ b/web/app/components/plugins/marketplace/hydration-server.tsx
@@ -252,13 +252,15 @@ async function getDehydratedState(
 export async function HydrateQueryClient({
   params,
   searchParams,
+  isMarketplacePlatform = false,
   children,
 }: {
   params?: Awaitable<{ category?: string, creationType?: string, searchTab?: string } | undefined>
   searchParams?: Awaitable<SearchParams>
+  isMarketplacePlatform?: boolean
   children: React.ReactNode
 }) {
-  const dehydratedState = await getDehydratedState(params, searchParams)
+  const dehydratedState = isMarketplacePlatform ? await getDehydratedState(params, searchParams) : null
 
   return (
     <HydrationBoundary state={dehydratedState}>
diff --git a/web/app/components/plugins/marketplace/index.tsx b/web/app/components/plugins/marketplace/index.tsx
index 28c0734df7..268f8bd43f 100644
--- a/web/app/components/plugins/marketplace/index.tsx
+++ b/web/app/components/plugins/marketplace/index.tsx
@@ -30,8 +30,14 @@ const Marketplace = ({
 }: MarketplaceProps) => {
   return (
     <TanstackQueryInitializer>
-      <HydrateQueryClient searchParams={searchParams} params={params}>
-        <HydrateClient isMarketplacePlatform={isMarketplacePlatform}>
+      <HydrateQueryClient
+        isMarketplacePlatform={isMarketplacePlatform}
+        searchParams={searchParams}
+        params={params}
+      >
+        <HydrateClient
+          isMarketplacePlatform={isMarketplacePlatform}
+        >
           <MarketplaceHeader descriptionClassName={cn('mx-12 mt-1', isMarketplacePlatform && 'top-0 mx-0 mt-0 rounded-none')} marketplaceNav={marketplaceNav} />
           <MarketplaceContent
             showInstallButton={showInstallButton}