diff --git a/public/index.html b/public/index.html
index 0ea70d0ab..a4ede32e6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2347,13 +2347,7 @@
                             <div>
                                 <h4 data-i18n="Claude Model">Claude Model</h4>
                                 <select id="model_claude_select">
-                                    <optgroup label="Latest">
-                                        <option value="claude-3-opus-20240229">claude-3-opus-20240229</option>
-                                        <option value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
-                                        <option value="claude-2">claude-2</option>
-                                        <option value="claude-1.3">claude-1.3</option>
-                                    </optgroup>
-                                    <optgroup label="Sub-versions">
+                                    <optgroup label="Versions">
                                         <option value="claude-3-opus-20240229">claude-3-opus-20240229</option>
                                         <option value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
                                         <option value="claude-2.1">claude-2.1</option>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 29dd6c5c1..5f1f93e26 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -213,7 +213,7 @@ const default_settings = {
     scenario_format: default_scenario_format,
     personality_format: default_personality_format,
     openai_model: 'gpt-3.5-turbo',
-    claude_model: 'claude-2',
+    claude_model: 'claude-2.1',
     google_model: 'gemini-pro',
     ai21_model: 'j2-ultra',
     mistralai_model: 'mistral-medium-latest',
@@ -282,7 +282,7 @@ const oai_settings = {
     scenario_format: default_scenario_format,
     personality_format: default_personality_format,
     openai_model: 'gpt-3.5-turbo',
-    claude_model: 'claude-2',
+    claude_model: 'claude-2.1',
     google_model: 'gemini-pro',
     ai21_model: 'j2-ultra',
     mistralai_model: 'mistral-medium-latest',
@@ -3332,7 +3332,7 @@ async function onModelChange() {
     if ($(this).is('#model_claude_select')) {
         if (value.includes('-v')) {
             value = value.replace('-v', '-');
-        } else if (value === '') {
+        } else if (value === '' || value === 'claude-2') {
             value = default_settings.claude_model;
         }
         console.log('Claude model changed to', value);
@@ -3446,7 +3446,7 @@ async function onModelChange() {
         if (oai_settings.max_context_unlocked) {
             $('#openai_max_context').attr('max', max_200k);
         }
-        else if (value == 'claude-2.1' || value == 'claude-2' || value.startsWith('claude-3')) {
+        else if (value == 'claude-2.1' || value.startsWith('claude-3')) {
             $('#openai_max_context').attr('max', max_200k);
         }
         else if (value.endsWith('100k') || value.startsWith('claude-2') || value === 'claude-instant-1.2') {