diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
index 2ac1609e7c..b60ea24dbc 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -56,10 +56,13 @@
     } else {
       // We don't store the default BB AI config in the DB
       delete fullAIConfig.config.budibase_ai
+
       // unset the default value from other configs if default is set
       if (editingAIConfig.isDefault) {
         for (let key in fullAIConfig.config) {
-          fullAIConfig.config[key].isDefault = false
+          if (key !== id) {
+            fullAIConfig.config[key].isDefault = false
+          }
         }
       }
       // Add new or update existing custom AI Config
diff --git a/packages/pro b/packages/pro
index 69633aa64b..5daf17e325 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 69633aa64b962ac4bad01360a421fe941a15fb2c
+Subproject commit 5daf17e32595e539f1f4a92b59a2ea2854d9dbd4
diff --git a/packages/server/src/automations/steps/openai.ts b/packages/server/src/automations/steps/openai.ts
index 79b6664674..5eff12db47 100644
--- a/packages/server/src/automations/steps/openai.ts
+++ b/packages/server/src/automations/steps/openai.ts
@@ -115,7 +115,6 @@ export async function run({
             "OpenAI API Key not configured - please add the OPENAI_API_KEY environment variable.",
         }
       }
-
       response = await legacyOpenAIPrompt(inputs)
     }