diff --git a/frontend/src/lib/components/Auth0Setting.svelte b/frontend/src/lib/components/Auth0Setting.svelte
index 5d8dc9ba5a..1116ea0d27 100644
--- a/frontend/src/lib/components/Auth0Setting.svelte
+++ b/frontend/src/lib/components/Auth0Setting.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { untrack } from 'svelte'
 	import CollapseLink from './CollapseLink.svelte'
 	import IconedResourceType from './IconedResourceType.svelte'
 	import Toggle from './Toggle.svelte'
@@ -32,8 +33,12 @@
 		}
 	}
 	let enabled = $derived(value != undefined)
-	$effect(() => {
-		changeDomain(value?.['domain'], value?.['custom'])
+	let lastValues = { domain: undefined, custom: undefined }
+	$effect.pre(() => {
+		if (value?.['domain'] != lastValues.domain || value?.['custom'] != lastValues.custom) {
+			lastValues = { domain: value?.['domain'], custom: value?.['custom'] }
+			untrack(() => changeDomain(value?.['domain'], value?.['custom']))
+		}
 	})
 </script>
 
diff --git a/frontend/src/lib/components/OktaSetting.svelte b/frontend/src/lib/components/OktaSetting.svelte
index 5a1836ec7d..7ad4cb01b4 100644
--- a/frontend/src/lib/components/OktaSetting.svelte
+++ b/frontend/src/lib/components/OktaSetting.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { untrack } from 'svelte'
 	import CollapseLink from './CollapseLink.svelte'
 	import IconedResourceType from './IconedResourceType.svelte'
 	import Toggle from './Toggle.svelte'
@@ -12,6 +13,8 @@
 
 	let { value = $bindable() }: Props = $props()
 
+	let lastValues = { domain: undefined, custom: undefined }
+
 	function changeDomain(domain, custom) {
 		if (value) {
 			let baseUrl = custom ? `https://${domain}` : `https://${domain}.okta.com`
@@ -32,8 +35,11 @@
 		}
 	}
 	let enabled = $derived(value != undefined)
-	$effect(() => {
-		changeDomain(value?.['domain'], value?.['custom'])
+	$effect.pre(() => {
+		if (value?.['domain'] != lastValues.domain || value?.['custom'] != lastValues.custom) {
+			lastValues = { domain: value?.['domain'], custom: value?.['custom'] }
+			untrack(() => changeDomain(value?.['domain'], value?.['custom']))
+		}
 	})
 </script>