diff --git a/src/lib/backend/convex/conversations.ts b/src/lib/backend/convex/conversations.ts
index 0be07a4..4d24f41 100644
--- a/src/lib/backend/convex/conversations.ts
+++ b/src/lib/backend/convex/conversations.ts
@@ -37,10 +37,12 @@ export const get = query({
 
 export const getById = query({
 	args: {
-		conversation_id: v.id('conversations'),
+		conversation_id: v.optional(v.id('conversations')),
 		session_token: v.string(),
 	},
 	handler: async (ctx, args) => {
+		if (!args.conversation_id) return null;
+
 		const session = await ctx.runQuery(api.betterAuth.publicGetSession, {
 			session_token: args.session_token,
 		});