diff --git a/apps/web/app/(org)/dashboard/caps/page.tsx b/apps/web/app/(org)/dashboard/caps/page.tsx
index 98f4753f4f..e9bd381e4e 100644
--- a/apps/web/app/(org)/dashboard/caps/page.tsx
+++ b/apps/web/app/(org)/dashboard/caps/page.tsx
@@ -96,9 +96,7 @@ async function getSharedSpacesForVideos(videoIds: Video.VideoId[]) {
 	return sharedSpacesMap;
 }
 
-export default async function CapsPage(props: {
-	searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
-}) {
+export default async function CapsPage(props: PageProps<"/dashboard/caps">) {
 	const searchParams = await props.searchParams;
 	const user = await getCurrentUser();
 
@@ -106,9 +104,10 @@ export default async function CapsPage(props: {
 		redirect("/login");
 	}
 
-	const userId = user.id;
 	const page = Number(searchParams.page) || 1;
 	const limit = Number(searchParams.limit) || 15;
+
+	const userId = user.id;
 	const offset = (page - 1) * limit;
 
 	const totalCountResult = await db()
diff --git a/apps/web/app/(org)/layout.tsx b/apps/web/app/(org)/layout.tsx
index 7ba33e6624..374ace11c2 100644
--- a/apps/web/app/(org)/layout.tsx
+++ b/apps/web/app/(org)/layout.tsx
@@ -1,8 +1,6 @@
 import type { PropsWithChildren } from "react";
 import { Intercom } from "../Layout/Intercom";
 
-export const revalidate = 0;
-
 export default function Layout(props: PropsWithChildren) {
 	return (
 		<>
diff --git a/apps/web/app/(site)/download/[platform]/route.ts b/apps/web/app/(site)/download/[platform]/route.ts
index 07a250f9b0..ae9507bb08 100644
--- a/apps/web/app/(site)/download/[platform]/route.ts
+++ b/apps/web/app/(site)/download/[platform]/route.ts
@@ -2,9 +2,6 @@ import { type NextRequest, NextResponse } from "next/server";
 
 export const runtime = "edge";
 
-// Disable caching to ensure users always get the latest download URL
-export const revalidate = 0;
-
 export async function GET(
 	request: NextRequest,
 	props: { params: Promise<{ platform: string }> },
diff --git a/apps/web/app/api/changelog/status/route.ts b/apps/web/app/api/changelog/status/route.ts
index 0c5d18d77d..3d6f5c1107 100644
--- a/apps/web/app/api/changelog/status/route.ts
+++ b/apps/web/app/api/changelog/status/route.ts
@@ -1,8 +1,6 @@
 import { NextResponse } from "next/server";
 import { getChangelogPosts } from "../../../../utils/changelog";
 
-export const revalidate = 0;
-
 export async function GET(request: Request) {
 	const { searchParams } = new URL(request.url);
 	const version = searchParams.get("version");
diff --git a/apps/web/app/api/download/route.ts b/apps/web/app/api/download/route.ts
index 00a0a2f580..dd7dd3a111 100644
--- a/apps/web/app/api/download/route.ts
+++ b/apps/web/app/api/download/route.ts
@@ -1,7 +1,6 @@
 import { type NextRequest, NextResponse } from "next/server";
 
 export const runtime = "edge";
-export const revalidate = 0;
 
 export async function GET(request: NextRequest) {
 	const userAgent = request.headers.get("user-agent") || "";
diff --git a/apps/web/app/api/releases/tauri/[version]/[target]/[arch]/route.ts b/apps/web/app/api/releases/tauri/[version]/[target]/[arch]/route.ts
index 70f31d08c7..91674a14de 100644
--- a/apps/web/app/api/releases/tauri/[version]/[target]/[arch]/route.ts
+++ b/apps/web/app/api/releases/tauri/[version]/[target]/[arch]/route.ts
@@ -4,8 +4,6 @@ const octokit = new Octokit();
 
 export const runtime = "edge";
 
-export const revalidate = 0;
-
 export async function GET(
 	req: Request,
 	props: RouteContext<"/api/releases/tauri/[version]/[target]/[arch]">,
diff --git a/apps/web/app/api/status/route.ts b/apps/web/app/api/status/route.ts
index 06caa11d07..895d1e2293 100644
--- a/apps/web/app/api/status/route.ts
+++ b/apps/web/app/api/status/route.ts
@@ -1,5 +1,3 @@
-export const revalidate = 0;
-
 export async function GET() {
 	return new Response("OK", {
 		status: 200,
diff --git a/apps/web/app/api/thumbnail/route.ts b/apps/web/app/api/thumbnail/route.ts
index 93ca4b9cc6..96610c568d 100644
--- a/apps/web/app/api/thumbnail/route.ts
+++ b/apps/web/app/api/thumbnail/route.ts
@@ -8,8 +8,6 @@ import type { NextRequest } from "next/server";
 import { runPromise } from "@/lib/server";
 import { getHeaders } from "@/utils/helpers";
 
-export const revalidate = 0;
-
 export async function GET(request: NextRequest) {
 	const { searchParams } = request.nextUrl;
 	const videoId = searchParams.get("videoId");
diff --git a/apps/web/app/embed/[videoId]/page.tsx b/apps/web/app/embed/[videoId]/page.tsx
index 14c0344070..ff12bcb7b8 100644
--- a/apps/web/app/embed/[videoId]/page.tsx
+++ b/apps/web/app/embed/[videoId]/page.tsx
@@ -23,10 +23,6 @@ import { isAiGenerationEnabled } from "@/utils/flags";
 import { EmbedVideo } from "./_components/EmbedVideo";
 import { PasswordOverlay } from "./_components/PasswordOverlay";
 
-export const dynamic = "auto";
-export const dynamicParams = true;
-export const revalidate = 30;
-
 export async function generateMetadata(
 	props: PageProps<"/embed/[videoId]">,
 ): Promise<Metadata> {
diff --git a/apps/web/app/robots.ts b/apps/web/app/robots.ts
index 72ea589a2c..0d4f4e859d 100644
--- a/apps/web/app/robots.ts
+++ b/apps/web/app/robots.ts
@@ -2,8 +2,6 @@ import type { MetadataRoute } from "next";
 import { headers, type UnsafeUnwrappedHeaders } from "next/headers";
 import { seoPages } from "@/lib/seo-pages";
 
-export const revalidate = 0;
-
 export default function robots(): MetadataRoute.Robots {
 	const seoPageSlugs = Object.keys(seoPages);
 	const headersList = headers() as unknown as UnsafeUnwrappedHeaders;
diff --git a/apps/web/app/s/[videoId]/page.tsx b/apps/web/app/s/[videoId]/page.tsx
index aa26626fc1..be76d9dcab 100644
--- a/apps/web/app/s/[videoId]/page.tsx
+++ b/apps/web/app/s/[videoId]/page.tsx
@@ -34,10 +34,6 @@ import { PasswordOverlay } from "./_components/PasswordOverlay";
 import { ShareHeader } from "./_components/ShareHeader";
 import { Share } from "./Share";
 
-export const dynamic = "auto";
-export const dynamicParams = true;
-export const revalidate = 30;
-
 // Helper function to fetch shared spaces data for a video
 async function getSharedSpacesForVideo(videoId: Video.VideoId) {
 	// Fetch space-level sharing