diff --git a/apps/web/app/(org)/onboarding/components/DownloadPage.tsx b/apps/web/app/(org)/onboarding/components/DownloadPage.tsx
index 023adaca8..f305550ce 100644
--- a/apps/web/app/(org)/onboarding/components/DownloadPage.tsx
+++ b/apps/web/app/(org)/onboarding/components/DownloadPage.tsx
@@ -4,10 +4,6 @@ import { Button, LogoBadge } from "@cap/ui";
 import { useDetectPlatform } from "hooks/useDetectPlatform";
 import { Clapperboard, Zap } from "lucide-react";
 import { useRouter } from "next/navigation";
-import { startTransition, useEffect, useState } from "react";
-import { toast } from "sonner";
-import { useEffectMutation } from "@/lib/EffectRuntime";
-import { withRpc } from "@/lib/Rpcs";
 import {
 	getDownloadButtonText,
 	getDownloadUrl,
@@ -39,35 +35,6 @@ export function DownloadPage() {
 	const { platform, isIntel } = useDetectPlatform();
 	const loading = platform === null;
 	const router = useRouter();
-	const [clickedContinue, setClickedContinue] = useState(false);
-
-	useEffect(() => {
-		startTransition(() => {
-			onboardingRequest.mutate();
-			router.refresh();
-		});
-	}, []);
-
-	const onboardingRequest = useEffectMutation({
-		mutationFn: () =>
-			withRpc((r) => {
-				return r.UserCompleteOnboardingStep({
-					step: "download",
-					data: undefined,
-				});
-			}),
-		onSuccess: () => {
-			if (clickedContinue) {
-				startTransition(() => {
-					router.push("/dashboard/caps");
-					router.refresh();
-				});
-			}
-		},
-		onError: () => {
-			toast.error("An error occurred, please try again");
-		},
-	});
 
 	return (
 		<div className="flex flex-col gap-12 justify-center items-center min-h-fit lg:gap-20">
@@ -109,12 +76,7 @@ export function DownloadPage() {
 					{getDownloadButtonText(platform, loading, isIntel)}
 				</Button>
 				<Button
-					onClick={() => {
-						setClickedContinue(true);
-						onboardingRequest.mutate();
-					}}
-					spinner={onboardingRequest.isPending && clickedContinue}
-					disabled={onboardingRequest.isPending && clickedContinue}
+					onClick={() => router.push("/dashboard/caps")}
 					className="min-w-[120px]"
 					variant="dark"
 					size="lg"
diff --git a/packages/web-backend/src/Users/UsersOnboarding.ts b/packages/web-backend/src/Users/UsersOnboarding.ts
index 2a8adb534..a40b017d9 100644
--- a/packages/web-backend/src/Users/UsersOnboarding.ts
+++ b/packages/web-backend/src/Users/UsersOnboarding.ts
@@ -172,33 +172,12 @@ export class UsersOnboarding extends Effect.Service<UsersOnboarding>()(
 								onboardingSteps: {
 									...user.onboardingSteps,
 									inviteTeam: true,
+									download: true,
 								},
 							})
 							.where(Dz.eq(Db.users.id, currentUser.id)),
 					);
 				}),
-
-				download: Effect.fn("Onboarding.download")(function* () {
-					const currentUser = yield* CurrentUser;
-
-					const [user] = yield* db.use((db) =>
-						db
-							.select()
-							.from(Db.users)
-							.where(Dz.eq(Db.users.id, currentUser.id)),
-					);
-
-					yield* db.use((db) =>
-						db
-							.update(Db.users)
-							.set({
-								onboardingSteps: { ...user.onboardingSteps, download: true },
-								onboarding_completed_at: new Date(),
-							})
-							.where(Dz.eq(Db.users.id, currentUser.id)),
-					);
-				}),
-
 				skipToDashboard: Effect.fn("Onboarding.skipToDashboard")(function* () {
 					const currentUser = yield* CurrentUser;
 
diff --git a/packages/web-backend/src/Users/UsersRpcs.ts b/packages/web-backend/src/Users/UsersRpcs.ts
index 8c6353a04..ce4b32abd 100644
--- a/packages/web-backend/src/Users/UsersRpcs.ts
+++ b/packages/web-backend/src/Users/UsersRpcs.ts
@@ -27,10 +27,6 @@ export const UsersRpcsLive = User.UserRpcs.toLayer(
 						case "inviteTeam":
 							yield* onboarding.inviteTeam();
 							return { step: "inviteTeam" as const, data: undefined };
-
-						case "download":
-							yield* onboarding.download();
-							return { step: "download" as const, data: undefined };
 						case "skipToDashboard":
 							yield* onboarding.skipToDashboard();
 							return { step: "skipToDashboard" as const, data: undefined };
diff --git a/packages/web-domain/src/User.ts b/packages/web-domain/src/User.ts
index 8113a870e..2f5f96fdd 100644
--- a/packages/web-domain/src/User.ts
+++ b/packages/web-domain/src/User.ts
@@ -37,10 +37,6 @@ export const OnboardingStepPayload = Schema.Union(
 		step: Schema.Literal("inviteTeam"),
 		data: Schema.Void,
 	}),
-	Schema.Struct({
-		step: Schema.Literal("download"),
-		data: Schema.Void,
-	}),
 	Schema.Struct({
 		step: Schema.Literal("skipToDashboard"),
 		data: Schema.Void,
@@ -66,10 +62,6 @@ export const OnboardingStepResult = Schema.Union(
 		step: Schema.Literal("inviteTeam"),
 		data: Schema.Void,
 	}),
-	Schema.Struct({
-		step: Schema.Literal("download"),
-		data: Schema.Void,
-	}),
 	Schema.Struct({
 		step: Schema.Literal("skipToDashboard"),
 		data: Schema.Void,