diff --git a/src/lib/backend/convex/conversations.ts b/src/lib/backend/convex/conversations.ts
index 8f09b1f..ec158d7 100644
--- a/src/lib/backend/convex/conversations.ts
+++ b/src/lib/backend/convex/conversations.ts
@@ -162,8 +162,6 @@ export const createBranched = mutation({
 
 		const existingConversation = await ctx.db.get(args.conversation_id);
 
-		console.log(existingConversation);
-
 		if (!existingConversation) throw new Error('Conversation not found');
 		if (existingConversation.user_id !== session.userId && !existingConversation.public)
 			throw new Error('Unauthorized');
@@ -187,8 +185,6 @@ export const createBranched = mutation({
 			cost_usd: newMessages.reduce((acc, m) => acc + (m.cost_usd ?? 0), 0),
 		});
 
-		console.log(newConversationId);
-
 		await Promise.all(
 			newMessages.map((m) => {
 				const newMessage = {
diff --git a/src/lib/backend/convex/user_enabled_models.ts b/src/lib/backend/convex/user_enabled_models.ts
index 2b39e02..bdb784e 100644
--- a/src/lib/backend/convex/user_enabled_models.ts
+++ b/src/lib/backend/convex/user_enabled_models.ts
@@ -91,7 +91,6 @@ export const set = mutation({
 		const session = await ctx.runQuery(api.betterAuth.publicGetSession, {
 			session_token: args.session_token,
 		});
-		console.log('Session', session);
 
 		if (!session) throw new Error('Invalid session token');
 
@@ -102,9 +101,6 @@ export const set = mutation({
 			)
 			.first();
 
-		console.log('Trying to set', args.model_id, 'for', session.userId);
-		console.log('Existing', !!existing);
-
 		if (args.enabled && existing) return; // nothing to do here
 
 		if (existing) {
diff --git a/src/routes/chat/[id]/message.svelte b/src/routes/chat/[id]/message.svelte
index d56deea..2bf3c7f 100644
--- a/src/routes/chat/[id]/message.svelte
+++ b/src/routes/chat/[id]/message.svelte
@@ -18,6 +18,7 @@
 	import { goto } from '$app/navigation';
 	import { callGenerateMessage } from '../../api/generate-message/call';
 	import * as Icons from '$lib/components/icons';
+	import { settings } from '$lib/state/settings.svelte';
 
 	const style = tv({
 		base: 'prose rounded-xl p-2 max-w-full',
@@ -66,37 +67,21 @@
 			return;
 		}
 
-		await goto(`/chat/${res.value}`);
-	}
-
-	async function branchAndGenerate() {
-		const res = await ResultAsync.fromPromise(
-			client.mutation(api.conversations.createBranched, {
-				conversation_id: message.conversation_id as Id<'conversations'>,
-				from_message_id: message._id,
-				session_token: session.current?.session.token ?? '',
-			}),
-			(e) => e
-		);
-
-		if (res.isErr()) {
-			console.error(res.error);
-			return;
-		}
-
 		const cid = res.value;
 
-		const generateRes = await callGenerateMessage({
-			session_token: session.current?.session.token ?? '',
-			conversation_id: cid,
-			model_id: message.model_id!,
-			images: message.images,
-			web_search_enabled: message.web_search_enabled,
-		});
+		if (message.role === 'user' && settings.modelId) {
+			const generateRes = await callGenerateMessage({
+				session_token: session.current?.session.token ?? '',
+				conversation_id: cid,
+				model_id: settings.modelId,
+				images: message.images,
+				web_search_enabled: message.web_search_enabled,
+			});
 
-		if (generateRes.isErr()) {
-			// TODO: add error toast
-			return;
+			if (generateRes.isErr()) {
+				// TODO: add error toast
+				return;
+			}
 		}
 
 		await goto(`/chat/${cid}`);
@@ -178,27 +163,15 @@
 						onClickPromise={createBranchedConversation}
 						{...tooltip.trigger}
 					>
-						<Icons.Branch class="group-data-[loading=true]:opacity-0" />
+						{#if message.role === 'user'}
+							<Icons.BranchAndRegen class="group-data-[loading=true]:opacity-0" />
+						{:else}
+							<Icons.Branch class="group-data-[loading=true]:opacity-0" />
+						{/if}
 					</Button>
 				{/snippet}
-				Branch off this message
+				{message.role === 'user' ? 'Branch and regenerate message' : 'Branch off this message'}
 			</Tooltip>
-			{#if message.role === 'user'}
-				<Tooltip>
-					{#snippet trigger(tooltip)}
-						<Button
-							size="icon"
-							variant="ghost"
-							class={cn('group order-0 size-7')}
-							onClickPromise={branchAndGenerate}
-							{...tooltip.trigger}
-						>
-							<Icons.BranchAndRegen class="group-data-[loading=true]:opacity-0" />
-						</Button>
-					{/snippet}
-					Branch and regenerate
-				</Tooltip>
-			{/if}
 			{#if message.content.length > 0}
 				<Tooltip>
 					{#snippet trigger(tooltip)}