diff --git a/demo/stateless/src/lib/auth-client.ts b/demo/stateless/src/lib/auth-client.ts
index b1bb4554ac..384588edd5 100644
--- a/demo/stateless/src/lib/auth-client.ts
+++ b/demo/stateless/src/lib/auth-client.ts
@@ -1,7 +1,5 @@
 import { createAuthClient } from "better-auth/react";
 
-export const authClient = createAuthClient({
-	baseURL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL || "http://localhost:3000",
-});
+export const authClient = createAuthClient();
 
 export const { signIn, signOut, useSession } = authClient;
diff --git a/demo/stateless/src/lib/auth.ts b/demo/stateless/src/lib/auth.ts
index fbbd155592..407d0bad3d 100644
--- a/demo/stateless/src/lib/auth.ts
+++ b/demo/stateless/src/lib/auth.ts
@@ -1,7 +1,16 @@
 import { betterAuth } from "better-auth";
 
+const baseURL: string | undefined =
+	process.env.VERCEL === "1"
+		? process.env.VERCEL_ENV === "production"
+			? process.env.BETTER_AUTH_URL
+			: process.env.VERCEL_ENV === "preview"
+				? `https://${process.env.VERCEL_URL}`
+				: undefined
+		: undefined;
+
 export const auth = betterAuth({
-	baseURL: process.env.BETTER_AUTH_URL,
+	baseURL,
 	secret: process.env.BETTER_AUTH_SECRET,
 
 	socialProviders: {