diff --git a/apps/web/lib/metadata.ts b/apps/web/lib/metadata.ts
index db37af3443b654..a1adf8d165e1d6 100644
--- a/apps/web/lib/metadata.ts
+++ b/apps/web/lib/metadata.ts
@@ -28,7 +28,6 @@ export const prepareRootMetadata = (recipe: RootMetadataRecipe): Metadata => ({
       {
         rel: "icon-mask",
         url: "/safari-pinned-tab.svg",
-        // @ts-expect-error TODO available in the never Next.js version
         color: "#000000",
       },
       {
diff --git a/apps/web/playwright/teams.e2e.ts b/apps/web/playwright/teams.e2e.ts
index 0914cc4eb81f2b..ae0c11d8213894 100644
--- a/apps/web/playwright/teams.e2e.ts
+++ b/apps/web/playwright/teams.e2e.ts
@@ -351,7 +351,7 @@ test.describe("Teams - Org", () => {
 
     await page.goto(`/team/${team.slug}/${teamEventSlug}`);
 
-    await expect(page.locator('[data-testid="404-page"]')).toBeVisible();
+    await expect(page.locator("text=This page could not be found")).toBeVisible();
     await doOnOrgDomain(
       {
         orgSlug: org.slug,
diff --git a/packages/app-store/_utils/paid-apps.ts b/packages/app-store/_utils/paid-apps.ts
index 6d39c98ff6a2d6..1217831a45dfee 100644
--- a/packages/app-store/_utils/paid-apps.ts
+++ b/packages/app-store/_utils/paid-apps.ts
@@ -40,6 +40,8 @@ export const withPaidAppRedirect = async ({
       ? {
           subscription_data: {
             trial_period_days: trialDays,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore - trial_settings isn't available cc @erik
             trial_settings: { end_behavior: { missing_payment_method: "cancel" } },
           },
         }
diff --git a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
index 7c9f2f9868a0dd..f09d5f8345bcb7 100644
--- a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
+++ b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
@@ -36,7 +36,7 @@ test.describe("Routing Forms", () => {
       await page.goto(`apps/routing-forms/route-builder/${formId}`);
       await disableForm(page);
       await gotoRoutingLink({ page, formId });
-      await expect(page.locator("text=ERROR 404")).toBeVisible();
+      await expect(page.locator("text=This page could not be found")).toBeVisible();
     });
 
     test("should be able to edit the form", async ({ page }) => {
diff --git a/packages/lib/hooks/useCompatSearchParams.tsx b/packages/lib/hooks/useCompatSearchParams.tsx
index 032ba115a19678..3112bb3827f1d7 100644
--- a/packages/lib/hooks/useCompatSearchParams.tsx
+++ b/packages/lib/hooks/useCompatSearchParams.tsx
@@ -8,7 +8,9 @@ export const useCompatSearchParams = () => {
   Object.getOwnPropertyNames(params).forEach((key) => {
     searchParams.delete(key);
 
-    const param = params[key];
+    // Though useParams is supposed to return a string/string[] as the key's value but it is found to return undefined as well.
+    // Maybe it happens for pages dir when using optional catch-all routes.
+    const param = params[key] || "";
     const paramArr = typeof param === "string" ? param.split("/") : param;
 
     paramArr.forEach((p) => {