diff --git a/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte b/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
index edace3a75b..8342d0d092 100644
--- a/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
+++ b/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Job, JobService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import SchemaForm from './SchemaForm.svelte'
+	import LightweightSchemaForm from './LightweightSchemaForm.svelte'
 	import Tooltip from './Tooltip.svelte'
 	import { Button } from './common'
 
@@ -51,10 +51,9 @@
 				</div>
 				{#if job.raw_flow?.modules?.[approvalStep]?.suspend?.resume_form?.schema}
 					<div class="w-full border rounded-lg p-2">
-						<SchemaForm
-							noVariablePicker
+						<LightweightSchemaForm
 							bind:args={payload}
-							schema={job.raw_flow?.modules?.[approvalStep]?.suspend?.resume_form?.schema}
+							schema={job.raw_flow?.modules?.[approvalStep]?.suspend?.resume_form?.schema ?? {}}
 						/>
 					</div>
 				{/if}
diff --git a/frontend/src/lib/components/LightweightSchemaForm.svelte b/frontend/src/lib/components/LightweightSchemaForm.svelte
index 853386aec3..11d0e66ce3 100644
--- a/frontend/src/lib/components/LightweightSchemaForm.svelte
+++ b/frontend/src/lib/components/LightweightSchemaForm.svelte
@@ -7,7 +7,7 @@
 
 	export let css: ComponentCustomCSS<'schemaformcomponent'> | undefined = undefined
 
-	export let schema: Schema
+	export let schema: Schema | Record<string, any>
 	export let args: Record<string, any> | undefined = undefined
 	export let displayType: boolean = true
 	export let largeGap: boolean = false
diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 1cc8b98f58..8ac1d6a2ec 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -15,7 +15,7 @@
 	import { Unlock } from 'lucide-svelte'
 	import RecomputeAllComponents from './RecomputeAllComponents.svelte'
 	import GridViewer from './GridViewer.svelte'
-	import { Component } from './component'
+	import Component from './component/Component.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { columnConfiguration } from '../gridUtils'
 	import { HiddenComponent } from '../components'
diff --git a/frontend/src/lib/components/apps/editor/component/index.ts b/frontend/src/lib/components/apps/editor/component/index.ts
index 962b0c8d23..dc5f5a0cf5 100644
--- a/frontend/src/lib/components/apps/editor/component/index.ts
+++ b/frontend/src/lib/components/apps/editor/component/index.ts
@@ -1,5 +1,3 @@
-export { default as Component } from './Component.svelte'
-
 export * from './components'
 export * from './default-codes'
-export * from './sets'
\ No newline at end of file
+export * from './sets'