diff --git a/packages/better-auth/src/db/internal-adapter.ts b/packages/better-auth/src/db/internal-adapter.ts
index 1fb00e4198..24671f0e87 100644
--- a/packages/better-auth/src/db/internal-adapter.ts
+++ b/packages/better-auth/src/db/internal-adapter.ts
@@ -5,6 +5,7 @@ import { getAuthTables } from "./get-tables";
 import type { Account, Session, User, Verification } from "./schema";
 import { generateId } from "../utils/id";
 import { getWithHooks } from "./with-hooks";
+import { getIp } from "../utils/get-request-ip";
 
 export const createInternalAdapter = (
 	adapter: Adapter,
@@ -145,7 +146,7 @@ export const createInternalAdapter = (
 				expiresAt: dontRememberMe
 					? getDate(60 * 60 * 24, "sec") // 1 day
 					: getDate(sessionExpiration, "sec"),
-				ipAddress: headers?.get("x-forwarded-for") || "",
+				ipAddress: request ? getIp(request) || "" : "",
 				userAgent: headers?.get("user-agent") || "",
 				...override,
 			};
diff --git a/packages/better-auth/src/utils/get-request-ip.ts b/packages/better-auth/src/utils/get-request-ip.ts
index 9ef54b904a..c0027de186 100644
--- a/packages/better-auth/src/utils/get-request-ip.ts
+++ b/packages/better-auth/src/utils/get-request-ip.ts
@@ -1,9 +1,9 @@
-export function getIp(req: Request): string | null {
+export function getIp(req: Request | Headers): string | null {
 	const testIP = "127.0.0.1";
 	if (process.env.NODE_ENV === "test") {
 		return testIP;
 	}
-	const headers = [
+	const keys = [
 		"x-client-ip",
 		"x-forwarded-for",
 		"cf-connecting-ip",
@@ -14,9 +14,9 @@ export function getIp(req: Request): string | null {
 		"forwarded-for",
 		"forwarded",
 	];
-
-	for (const header of headers) {
-		const value = req.headers.get(header);
+	const headers = req instanceof Request ? req.headers : req;
+	for (const key of keys) {
+		const value = headers.get(key);
 		if (typeof value === "string") {
 			const ip = value.split(",")[0].trim();
 			if (ip) return ip;