diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index f5b6eeda27..f2d652286e 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -230,7 +230,11 @@
 
 	let oldDefaultValue = structuredClone(defaultValue)
 	function handleDefaultValueChange() {
-		if (deepEqual(value, oldDefaultValue)) {
+		if (
+			deepEqual(value, oldDefaultValue) &&
+			!deepEqual(value, defaultValue) &&
+			!deepEqual(defaultValue, oldDefaultValue)
+		) {
 			value = defaultValue
 		}
 		oldDefaultValue = structuredClone(defaultValue)
diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index 3720bc585b..3991f1c3e5 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -265,7 +265,10 @@
 							dispatch('click', argName)
 						}}
 					>
-						{#if typeof args == 'object' && schema?.properties[argName]}
+						{#if args && typeof args == 'object' && schema?.properties[argName]}
+							<!-- {argName}
+							{args == undefined}
+							{JSON.stringify(args?.[argName])} -->
 							{#if !hidden[argName]}
 								<ArgInput
 									on:change={() => {
diff --git a/frontend/src/lib/components/flows/content/FlowInput.svelte b/frontend/src/lib/components/flows/content/FlowInput.svelte
index 00f4083f12..5ae31191b1 100644
--- a/frontend/src/lib/components/flows/content/FlowInput.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInput.svelte
@@ -304,7 +304,7 @@
 
 	function resetArgs() {
 		if (!previewSchema) {
-			previewArguments = undefined
+			// previewArguments = undefined
 			savedPreviewArgs = undefined
 		}
 	}
diff --git a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
index e8bc5d6fb5..921f912366 100644
--- a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
+++ b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
@@ -304,7 +304,7 @@
 		{/if}
 	{:else if type === 'object' && format !== 'resource-s3_object'}
 		<Tabs
-			selected={initialObjectSelected}
+			bind:selected={initialObjectSelected}
 			on:selected={(e) => {
 				if (e.detail === 'custom-object') {
 					format = ''
@@ -327,7 +327,7 @@
 		</Tabs>
 	{/if}
 
-	{#if !(type === 'object' && oneOf && oneOf.length >= 2)}
+	{#if !(type === 'object' && oneOf && oneOf.length >= 2) && !(type == 'object' && initialObjectSelected == 'custom-object')}
 		<Label label="Default">
 			<ArgInput
 				noDefaultOnSelectFirst