diff --git a/api/server/routes/endpoints/schemas.js b/api/server/routes/endpoints/schemas.js
index 0be3987db6..84ad36b330 100644
--- a/api/server/routes/endpoints/schemas.js
+++ b/api/server/routes/endpoints/schemas.js
@@ -381,7 +381,7 @@ const getResponseSender = (endpointOption) => {
   }
 
   if (endpoint === EModelEndpoint.anthropic) {
-    return modelLabel ?? 'Anthropic';
+    return modelLabel ?? 'Claude';
   }
 
   if (endpoint === EModelEndpoint.google) {
diff --git a/api/server/services/ModelService.js b/api/server/services/ModelService.js
index 7a2917832a..086e8b7396 100644
--- a/api/server/services/ModelService.js
+++ b/api/server/services/ModelService.js
@@ -115,11 +115,12 @@ const getChatGPTBrowserModels = () => {
 
 const getAnthropicModels = () => {
   let models = [
+    'claude-2.1',
+    'claude-2',
     'claude-1',
     'claude-1-100k',
     'claude-instant-1',
     'claude-instant-1-100k',
-    'claude-2',
   ];
   if (ANTHROPIC_MODELS) {
     models = String(ANTHROPIC_MODELS).split(',');
diff --git a/client/src/components/Chat/Menus/Presets/PresetItems.tsx b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
index e2881d40b0..50f583d76e 100644
--- a/client/src/components/Chat/Menus/Presets/PresetItems.tsx
+++ b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
@@ -98,6 +98,7 @@ const PresetItems: FC<{
                       className="m-0 h-full rounded-md p-2 px-4 text-gray-400 hover:text-gray-700 dark:bg-gray-700 dark:text-gray-400 dark:hover:text-gray-200 sm:invisible sm:group-hover:visible"
                       onClick={(e) => {
                         e.preventDefault();
+                        e.stopPropagation();
                         onChangePreset(preset);
                       }}
                     >
diff --git a/client/src/components/Nav/NavLinks.tsx b/client/src/components/Nav/NavLinks.tsx
index 5bda65921e..386cd918e5 100644
--- a/client/src/components/Nav/NavLinks.tsx
+++ b/client/src/components/Nav/NavLinks.tsx
@@ -41,8 +41,6 @@ function NavLinks() {
     conversation.conversationId !== 'new' &&
     conversation.conversationId !== 'search';
 
-  console.log('NavLinks', conversation, exportable);
-
   const clickHandler = () => {
     if (exportable) {
       setShowExports(true);
diff --git a/client/src/hooks/useChatHelpers.ts b/client/src/hooks/useChatHelpers.ts
index 2437282bcc..3eb8f857d2 100644
--- a/client/src/hooks/useChatHelpers.ts
+++ b/client/src/hooks/useChatHelpers.ts
@@ -157,7 +157,7 @@ export default function useChatHelpers(index = 0, paramId: string | undefined) {
       endpoint,
       key: getExpiry(),
     } as TEndpointOption;
-    const responseSender = getResponseSender(endpointOption);
+    const responseSender = getResponseSender({ model: conversation?.model, ...endpointOption });
 
     let currentMessages: TMessage[] | null = getMessages() ?? [];
 
diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.ts
index 38ccad17d8..41ba554b32 100644
--- a/packages/data-provider/src/schemas.ts
+++ b/packages/data-provider/src/schemas.ts
@@ -533,7 +533,7 @@ export const getResponseSender = (endpointOption: TEndpointOption): string => {
   }
 
   if (endpoint === EModelEndpoint.anthropic) {
-    return modelLabel ?? 'Anthropic';
+    return modelLabel ?? 'Claude';
   }
 
   if (endpoint === EModelEndpoint.google) {