diff --git a/apps/web/pages/api/v2-opt-in.ts b/apps/web/pages/api/v2-opt-in.ts
index cb2e7b8083..cd9fcca0b6 100644
--- a/apps/web/pages/api/v2-opt-in.ts
+++ b/apps/web/pages/api/v2-opt-in.ts
@@ -15,7 +15,12 @@ async function handler(req: NextApiRequest, res: NextApiResponse<Response>): Pro
     res.setHeader("Set-Cookie", "calcom-v2-early-access=1; Path=/");
   }
 
-  res.redirect("/");
+  let redirectUrl = "/";
+
+  // We take you back where you came from if possible
+  if (typeof req.headers["referer"] === "string") redirectUrl = req.headers["referer"];
+
+  res.redirect(redirectUrl);
 }
 
 export default defaultHandler({