diff --git a/public/index.html b/public/index.html
index 6f0c67322..7b3673c0d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3094,66 +3094,12 @@
                             <div data-for="api_key_nanogpt" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you reload the page.">
                                 For privacy reasons, your API key will be hidden after you reload the page.
                             </div>
-                            <h4 data-i18n="NanoGPT Model">NanoGPT Model</h4>
-                            <select id="model_nanogpt_select">
-                                <option value="chatgpt-4o-latest">ChatGPT 4o</option>
-                                <option value="o1-preview">OpenAI o1</option>
-                                <option value="o1-mini">OpenAI o1-mini</option>
-                                <option value="claude-3-5-sonnet-20241022">Claude 3.5 Sonnet</option>
-                                <option value="claude-3-5-sonnet-20240620">Claude 3.5 Sonnet Old</option>
-                                <option value="google/gemini-pro-1.5">Gemini 1.5 Pro</option>
-                                <option value="google/gemini-pro-1.5-exp">Gemini 1.5 Pro Exp</option>
-                                <option value="Meta-Llama-3-1-405B-Instruct-FP8">Llama 3.1 Large</option>
-                                <option value="nvidia/llama-3.1-nemotron-70b-instruct">Nvidia Nemotron</option>
-                                <option value="nousresearch/hermes-3-llama-3.1-405b">Hermes 3 Large</option>
-                                <option value="meta-llama/llama-3.2-90b-vision-instruct">Llama 3.2 Medium</option>
-                                <option value="x-ai/grok-beta">Grok 2</option>
-                                <option value="neversleep/llama-3.1-lumimaid-70b">Lumimaid v0.2</option>
-                                <option value="inflection/inflection-3-pi">Inflection 3 Pi</option>
-                                <option value="inflection/inflection-3-productivity">Inflection 3 Productivity</option>
-                                <option value="microsoft/wizardlm-2-8x22b">WizardLM-2 8x22B</option>
-                                <option value="accounts/fireworks/models/llama-v3p1-405b-instruct">Llama 3.1 Large</option>
-                                <option value="gpt-4o-2024-08-06">GPT 4o</option>
-                                <option value="accounts/fireworks/models/llama-v3p1-70b-instruct">Llama 3.1 Medium</option>
-                                <option value="llama-3.1-70b-instruct">Llama 3.1 Medium</option>
-                                <option value="llama-3.1-sonar-huge-128k-online">Perplexity Online</option>
-                                <option value="gpt-4o-mini">GPT 4o mini</option>
-                                <option value="meta-llama/llama-3.1-405b-instruct">Llama 3.1 Large</option>
-                                <option value="claude-3-opus-20240229">Claude 3 Opus</option>
-                                <option value="google/gemini-flash-1.5-exp">Gemini 1.5 Flash</option>
-                                <option value="google/gemini-flash-1.5">Gemini 1.5 Flash</option>
-                                <option value="llama-3.1-sonar-large-128k-online">Perplexity Online Medium</option>
-                                <option value="nousresearch/hermes-3-llama-3.1-405b:extended">Hermes 3 Large</option>
-                                <option value="gryphe/mythomax-l2-13b">MythoMax 13B</option>
-                                <option value="deepseek/deepseek-chat">DeepSeek V2.5</option>
-                                <option value="qwen/qwen-2.5-72b-instruct">Qwen2.5 72B</option>
-                                <option value="eva-unit-01/eva-qwen-2.5-14b">EVA Qwen2.5 14B</option>
-                                <option value="cognitivecomputations/dolphin-mixtral-8x7b">Dolphin 2.6 Mixtral 8x7b</option>
-                                <option value="gpt-4-turbo-preview">GPT 4 Turbo</option>
-                                <option value="gpt-4o">GPT 4o</option>
-                                <option value="gpt-3.5-turbo">GPT 3.5 Turbo</option>
-                                <option value="gemini-1.5-flash-001">Gemini 1.5 Flash</option>
-                                <option value="gemini-1.5-pro-001">Gemini 1.5 Pro</option>
-                                <option value="free-model">Playground</option>
-                                <option value="anthracite-org/magnum-v4-72b">Magnum v4 72B</option>
-                                <option value="thedrummer/rocinante-12b">Rocinante 12B</option>
-                                <option value="cognitivecomputations/dolphin-mixtral-8x22b">Dolphin 2.9.2 Mixtral 8x22B</option>
-                                <option value="meta-llama/llama-3.1-70b-instruct">Llama 3.1 70b Instruct</option>
-                                <option value="meta-llama/llama-3.1-8b-instruct">Llama 3.1 8b Instruct</option>
-                                <option value="sao10k/l3-euryale-70b">L3 Euryale 70B</option>
-                                <option value="mistralai/mistral-tiny">Mistral Tiny</option>
-                                <option value="mistralai/mistral-7b-instruct">Mistral 7B Instruct</option>
-                                <option value="meta-llama/llama-3-70b-instruct">Llama 3 70b Instruct</option>
-                                <option value="microsoft/wizardlm-2-7b">WizardLM-2 7B</option>
-                                <option value="cohere/command-r">Cohere: Command R</option>
-                                <option value="nousresearch/hermes-3-llama-3.1-70b">Nous Hermes 3 70B Instruct</option>
-                                <option value="mistralai/mistral-nemo">Mistral Nemo</option>
-                                <option value="meta-llama/llama-3.2-3b-instruct">Llama 3.2 3b Instruct</option>
-                                <option value="neversleep/llama-3-lumimaid-70b">Llama 3 Lumimaid 70B</option>
-                                <option value="anthracite-org/magnum-v2-72b">Magnum v2 72B</option>
-                                <option value="Meta-Llama-3-1-8B-Instruct-FP8">Llama 3.1 8B (decentralized)</option>
-                            </select>
-
+                            <div>
+                                <h4 data-i18n="NanoGPT Model">NanoGPT Model</h4>
+                                <select id="model_nanogpt_select">
+                                    <option value="" data-i18n="-- Connect to the API --">-- Connect to the API --</option>
+                                </select>
+                            </div>
                         </div>
                         <div id="perplexity_form" data-source="perplexity">
                             <h4 data-i18n="Perplexity API Key">Perplexity API Key</h4>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 2b2306ec3..cd76fc117 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -1641,6 +1641,23 @@ function saveModelList(data) {
             }
         }
     }
+
+    if (oai_settings.chat_completion_source == chat_completion_sources.NANOGPT) {
+        $('#model_nanogpt_select').empty();
+        model_list.forEach((model) => {
+            $('#model_nanogpt_select').append(
+                $('<option>', {
+                    value: model.id,
+                    text: model.id,
+                }));
+        });
+
+        if (!oai_settings.nanogpt_model && model_list.length > 0) {
+            oai_settings.nanogpt_model = model_list[0].id;
+        }
+
+        $('#model_nanogpt_select').val(oai_settings.nanogpt_model).trigger('change');
+    }
 }
 
 function appendOpenRouterOptions(model_list, groupModels = false, sort = false) {