diff --git a/docs/content/docs/plugins/oauth-provider.mdx b/docs/content/docs/plugins/oauth-provider.mdx
index 555ea04bdd..5d39cb487f 100644
--- a/docs/content/docs/plugins/oauth-provider.mdx
+++ b/docs/content/docs/plugins/oauth-provider.mdx
@@ -1591,7 +1591,7 @@ Table Name: `oauthRefreshToken`
     {
       name: "sessionId",
       type: "string",
-      description: "ID of the user associated with the token",
+      description: "ID of the session used at issuance of the token (and still active)",
       isForeignKey: true,
       isRequired: false,
       references: { model: "session", field: "id" },
@@ -1665,7 +1665,7 @@ Table Name: `oauthAccessToken`
     {
       name: "sessionId",
       type: "string",
-      description: "ID of the user associated with the token",
+      description: "ID of the session used at issuance of the token (and still active)",
       isForeignKey: true,
       isOptional: true,
       references: { model: "session", field: "id" },
@@ -1683,7 +1683,7 @@ Table Name: `oauthAccessToken`
       type: "string",
       description: "ID of the user associated with the token",
       isForeignKey: true,
-      isRequired: true,
+      isOptional: true,
       references: { model: "user", field: "id" },
     },
     {
diff --git a/packages/oauth-provider/src/oauth.ts b/packages/oauth-provider/src/oauth.ts
index 4648d3a109..3a115a7374 100644
--- a/packages/oauth-provider/src/oauth.ts
+++ b/packages/oauth-provider/src/oauth.ts
@@ -147,6 +147,11 @@ export const oauthProvider = <O extends OAuthOptions<Scope[]>>(options: O) => {
 		id: "oauthProvider",
 		options: opts,
 		init: (ctx) => {
+			// Require session id storage on database (secondary-storage only solution not yet supported)
+			if (ctx.options.session && !ctx.options.session.storeSessionInDatabase) {
+				throw new BetterAuthError("sessions must be stored on database");
+			}
+
 			// Check for jwt plugin registration
 			if (!opts.disableJwtPlugin) {
 				const jwtPlugin = getJwtPlugin(ctx);