diff --git a/frontend/src/lib/components/SchemaEditor.svelte b/frontend/src/lib/components/SchemaEditor.svelte
index c4de98d601..cc24b18ef9 100644
--- a/frontend/src/lib/components/SchemaEditor.svelte
+++ b/frontend/src/lib/components/SchemaEditor.svelte
@@ -274,18 +274,20 @@
 							<th />
 						</tr>
 						<tbody slot="body">
-							{#each schemaPropertiesToDisplay(schema) as displayInfo (displayInfoKey(displayInfo))}
-								<tr animate:flip={{ duration: moveAnimationDuration }}>
-									<PropertyRow
-										{displayInfo}
-										{isAnimated}
-										{lightMode}
-										on:startEditArgument={handleStartEditEvent}
-										on:deleteArgument={handleDeleteEvent}
-										on:changePosition={handleChangePositionEvent}
-									/>
-								</tr>
-							{/each}
+							{#key schema.required}
+								{#each schemaPropertiesToDisplay(schema) as displayInfo (displayInfoKey(displayInfo))}
+									<tr animate:flip={{ duration: moveAnimationDuration }}>
+										<PropertyRow
+											{displayInfo}
+											{isAnimated}
+											{lightMode}
+											on:startEditArgument={handleStartEditEvent}
+											on:deleteArgument={handleDeleteEvent}
+											on:changePosition={handleChangePositionEvent}
+										/>
+									</tr>
+								{/each}
+							{/key}
 						</tbody>
 					</TableCustom>
 				{:else}
diff --git a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
index efcc692e95..6b33d9984b 100644
--- a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
+++ b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
@@ -53,9 +53,12 @@
 		timeout && clearInterval(timeout)
 	})
 
-	$: job && getDefaultArgs()
+	let argsFetched = false
+	$: job && !argsFetched && getDefaultArgs()
 
+	let valid = true
 	async function getDefaultArgs() {
+		argsFetched = true
 		let jobId = job?.flow_status?.modules?.[approvalStep]?.job
 		if (!jobId) {
 			return {}
@@ -159,7 +162,7 @@
 	{/if}
 
 	{#if schema}
-		<SchemaForm {schema} bind:args={payload} noVariablePicker />
+		<SchemaForm bind:isValid={valid} {schema} bind:args={payload} noVariablePicker />
 	{/if}
 
 	<div class="w-max-md flex flex-row gap-x-4 gap-y-4 justify-between w-full flex-wrap mt-2">
@@ -175,7 +178,7 @@
 			color="green"
 			on:click|once={resume}
 			size="md"
-			disabled={completed || alreadyResumed}>Approve/Resume</Button
+			disabled={completed || alreadyResumed || !valid}>Approve/Resume</Button
 		>
 	</div>