diff --git a/packages/better-auth/src/oauth2/state.ts b/packages/better-auth/src/oauth2/state.ts
index e9cdd7b17f..0a33550b8d 100644
--- a/packages/better-auth/src/oauth2/state.ts
+++ b/packages/better-auth/src/oauth2/state.ts
@@ -10,7 +10,10 @@ import { logger } from "../utils";
 import { checkURLValidity } from "../utils/url";
 
 export async function generateState(c: GenericEndpointContext) {
-	const callbackURL = c.body?.callbackURL;
+	const callbackURL =
+		c.body?.callbackURL || c.query?.currentURL
+			? new URL(c.query?.currentURL).origin
+			: "";
 	if (!callbackURL) {
 		throw new APIError("BAD_REQUEST", {
 			message: "callbackURL is required",
diff --git a/packages/expo/package.json b/packages/expo/package.json
index c22bd72856..2ddb5b8627 100644
--- a/packages/expo/package.json
+++ b/packages/expo/package.json
@@ -34,9 +34,6 @@
     "expo-web-browser": "~13.0.3",
     "vitest": "^1.6.0"
   },
-  "dependencies": {
-    "nanostores": "^0.11.2"
-  },
   "peerDependencies": {
     "better-auth": "workspace:*"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 54e7bb8573..931d2c9598 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1768,10 +1768,6 @@ importers:
         version: 1.6.0(@edge-runtime/vm@3.2.0)(@types/node@22.8.4)(happy-dom@15.7.4)(jsdom@25.0.1)(lightningcss@1.27.0)(terser@5.33.0)
 
   packages/expo:
-    dependencies:
-      nanostores:
-        specifier: ^0.11.2
-        version: 0.11.3
     devDependencies:
       better-auth:
         specifier: workspace:*