diff --git a/sim/lib/auth-client.ts b/sim/lib/auth-client.ts
index 692e4553a7..3c0ad431c2 100644
--- a/sim/lib/auth-client.ts
+++ b/sim/lib/auth-client.ts
@@ -1,7 +1,25 @@
 import { emailOTPClient, genericOAuthClient } from 'better-auth/client/plugins'
 import { createAuthClient } from 'better-auth/react'
 
+export function getBaseURL() {
+  let baseURL
+
+  if (process.env.VERCEL_ENV === 'preview') {
+    baseURL = `https://${process.env.VERCEL_URL}`
+  } else if (process.env.VERCEL_ENV === 'development') {
+    baseURL = `https://${process.env.VERCEL_URL}`
+  } else if (process.env.VERCEL_ENV === 'production') {
+    baseURL = process.env.BETTER_AUTH_URL
+  } else if (process.env.NODE_ENV === 'development') {
+    baseURL = process.env.BETTER_AUTH_URL
+  }
+
+  console.log('baseURL:', baseURL)
+  return baseURL
+}
+
 export const client = createAuthClient({
+  baseURL: getBaseURL(),
   plugins: [genericOAuthClient(), emailOTPClient()],
 })
 export const { useSession } = client