diff --git a/public/script.js b/public/script.js
index 5a5f4c308..9a478aac7 100644
--- a/public/script.js
+++ b/public/script.js
@@ -5452,20 +5452,7 @@ function changeMainAPI() {
         getHordeModels();
     }
 
-    switch (oai_settings.chat_completion_source) {
-        case chat_completion_sources.SCALE:
-        case chat_completion_sources.OPENROUTER:
-        case chat_completion_sources.WINDOWAI:
-        case chat_completion_sources.CLAUDE:
-        case chat_completion_sources.OPENAI:
-        case chat_completion_sources.AI21:
-        case chat_completion_sources.MAKERSUITE:
-        case chat_completion_sources.MISTRALAI:
-        case chat_completion_sources.CUSTOM:
-        default:
-            setupChatCompletionPromptManager(oai_settings);
-            break;
-    }
+    setupChatCompletionPromptManager(oai_settings);
 }
 
 ////////////////////////////////////////////////////
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 7126c380f..750c040a8 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -482,7 +482,10 @@ function setOpenAIMessageExamples(mesExamplesArray) {
  */
 function setupChatCompletionPromptManager(openAiSettings) {
     // Do not set up prompt manager more than once
-    if (promptManager) return promptManager;
+    if (promptManager) {
+        promptManager.render(false);
+        return promptManager;
+    }
 
     promptManager = new PromptManager();