diff --git a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx
index 09e6be7fa7..2bacc2cc69 100644
--- a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx
+++ b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx
@@ -1,12 +1,17 @@
 import Main from './layout-main'
 
-const DatasetDetailLayout = async ({
-  children,
-  params,
-}: {
-  children: React.ReactNode
-  params: Promise<{ datasetId: string }>
-}) => {
+const DatasetDetailLayout = async (
+  props: {
+    children: React.ReactNode
+    params: Promise<{ datasetId: string }>
+  }
+) => {
+  const params = await props.params;
+
+  const {
+    children
+  } = props;
+
   return <Main params={(await params)}>{children}</Main>
 }
 export default DatasetDetailLayout
diff --git a/web/app/components/base/portal-to-follow-elem/index.tsx b/web/app/components/base/portal-to-follow-elem/index.tsx
index 2ce6e09834..a88e04889e 100644
--- a/web/app/components/base/portal-to-follow-elem/index.tsx
+++ b/web/app/components/base/portal-to-follow-elem/index.tsx
@@ -115,7 +115,6 @@ export const PortalToFollowElemTrigger = (
 ) => {
   const context = usePortalToFollowElemContext()
   const childrenRef = (children as any).props?.ref
-  console.log(childrenRef)
   const ref = useMergeRefs([context.refs.setReference, propRef, childrenRef])
 
   // `asChild` allows the user to pass any element as the anchor
diff --git a/web/app/components/billing/billing-page/index.tsx b/web/app/components/billing/billing-page/index.tsx
index 41068d516e..e1de25b0cc 100644
--- a/web/app/components/billing/billing-page/index.tsx
+++ b/web/app/components/billing/billing-page/index.tsx
@@ -20,6 +20,7 @@ const Billing: FC = () => {
     (!enableBilling || !isCurrentWorkspaceManager) ? null : ['/billing/invoices'],
     () => fetchBillingUrl().then(data => data.url),
   )
+  console.log(billingUrl)
 
   return (
     <div>
diff --git a/web/i18n/server.ts b/web/i18n/server.ts
index bd2eaec647..1a8bccdfe1 100644
--- a/web/i18n/server.ts
+++ b/web/i18n/server.ts
@@ -41,7 +41,7 @@ export const getLocaleOnServer = async (): Promise<Locale> => {
   if (!languages.length) {
     // Negotiator expects plain object so we need to transform headers
     const negotiatorHeaders: Record<string, string> = {}
-    headers().forEach((value, key) => (negotiatorHeaders[key] = value))
+    (await headers()).forEach((value, key) => (negotiatorHeaders[key] = value))
     // Use negotiator and intl-localematcher to get best locale
     languages = new Negotiator({ headers: negotiatorHeaders }).languages()
   }
diff --git a/web/package.json b/web/package.json
index d14a3556c7..f9b4d56ca1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -114,7 +114,7 @@
     "sharp": "^0.33.2",
     "shave": "^5.0.4",
     "sortablejs": "^1.15.0",
-    "swr": "^2.1.0",
+    "swr": "^2.3.0",
     "tailwind-merge": "^2.5.4",
     "use-context-selector": "^2.0.0",
     "uuid": "^10.0.0",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index 9733770f81..5e74fe71e8 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -284,7 +284,7 @@ importers:
         specifier: ^1.15.0
         version: 1.15.6
       swr:
-        specifier: ^2.1.0
+        specifier: ^2.3.0
         version: 2.3.2(react@19.0.0)
       tailwind-merge:
         specifier: ^2.5.4