diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index dd710eac9e..5858da0eb0 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -137,7 +137,7 @@
 			{#each $flowStore.value.modules as flowModule, index (flowModule.id ?? index)}
 				<FlowModuleWrapper
 					{noEditor}
-					bind:flowModule
+					bind:flowModule={$flowStore.value.modules[index]}
 					previousModule={$flowStore.value.modules[index - 1]}
 					{enableAi}
 				/>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
index a52370ea87..12e506ed48 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -193,10 +193,10 @@
 		/>
 	{/if}
 {:else if flowModule.value.type === 'forloopflow' || flowModule.value.type == 'whileloopflow'}
-	{#each flowModule.value.modules as submodule, index (index)}
+	{#each flowModule.value.modules as _, index (index)}
 		<svelte:self
 			{noEditor}
-			bind:flowModule={submodule}
+			bind:flowModule={flowModule.value.modules[index]}
 			bind:parentModule={flowModule}
 			previousModule={flowModule.value.modules[index - 1]}
 			{enableAi}
@@ -209,10 +209,10 @@
 			Nothing to configure, this is the default branch if none of the predicates are met.
 		</div>
 	{:else}
-		{#each flowModule.value.default as submodule, index}
+		{#each flowModule.value.default as _, index}
 			<svelte:self
 				{noEditor}
-				bind:flowModule={submodule}
+				bind:flowModule={flowModule.value.default[index]}
 				bind:parentModule={flowModule}
 				previousModule={flowModule.value.default[index - 1]}
 				{enableAi}
@@ -229,10 +229,10 @@
 				{enableAi}
 			/>
 		{:else}
-			{#each branch.modules as submodule, index}
+			{#each branch.modules as _, index}
 				<svelte:self
 					{noEditor}
-					bind:flowModule={submodule}
+					bind:flowModule={flowModule.value.branches[branchIndex].modules[index]}
 					bind:parentModule={flowModule}
 					previousModule={flowModule.value.branches[branchIndex].modules[index - 1]}
 					{enableAi}
@@ -245,10 +245,10 @@
 		{#if $selectedId === `${flowModule?.id}-branch-${branchIndex}`}
 			<FlowBranchAllWrapper {noEditor} bind:branch />
 		{:else}
-			{#each branch.modules as submodule, index}
+			{#each branch.modules as _, index}
 				<svelte:self
 					{noEditor}
-					bind:flowModule={submodule}
+					bind:flowModule={flowModule.value.branches[branchIndex].modules[index]}
 					bind:parentModule={flowModule}
 					previousModule={flowModule.value.branches[branchIndex].modules[index - 1]}
 					{enableAi}
diff --git a/frontend/src/lib/components/workspaceSettings/AISettings.svelte b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
index c49e2b509c..614d74faaf 100644
--- a/frontend/src/lib/components/workspaceSettings/AISettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
@@ -106,10 +106,13 @@
 						checked={!!aiProviders[provider]}
 						on:change={(e) => {
 							if (e.detail) {
-								aiProviders[provider] = {
-									resource_path: '',
-									models:
-										AI_DEFAULT_MODELS[provider].length > 0 ? [AI_DEFAULT_MODELS[provider][0]] : []
+								aiProviders = {
+									...aiProviders,
+									[provider]: {
+										resource_path: '',
+										models:
+											AI_DEFAULT_MODELS[provider].length > 0 ? [AI_DEFAULT_MODELS[provider][0]] : []
+									}
 								}
 
 								if (AI_DEFAULT_MODELS[provider].length > 0 && !defaultModel) {