diff --git a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
index 1037654614..65ffc7f7e1 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
@@ -68,7 +68,7 @@
 		}
 	}
 
-	$: resolvedConfig.triggerOnAppLoad && runnableComponent?.runComponent()
+	$: resolvedConfig?.triggerOnAppLoad && runnableComponent?.runComponent()
 
 	$: if (outputs?.loading != undefined) {
 		outputs.loading.set(false, true)
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 2eb997238a..b35da2331a 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -101,9 +101,17 @@
 	let testJob: CompletedJob | undefined = undefined
 	let testJobLoader: TestJobLoader | undefined = undefined
 
-	$: schemaStripped = stripSchema(fields, $stateId)
+	let schemaStripped: Schema | undefined =
+		autoRefresh || forceSchemaDisplay ? emptySchema() : undefined
+
+	$: (autoRefresh || forceSchemaDisplay) &&
+		Object.keys(fields ?? {}).length > 0 &&
+		(schemaStripped = stripSchema(fields, $stateId))
 
 	function stripSchema(inputs: AppInputs, s: any): Schema {
+		if (inputs === undefined) {
+			return emptySchema()
+		}
 		let schema =
 			runnable?.type == 'runnableByName' ? runnable.inlineScript?.schema : runnable?.schema
 		try {
@@ -308,7 +316,7 @@
 
 {#if render}
 	<div class="h-full flex relative flex-row flex-wrap {wrapperClass}" style={wrapperStyle}>
-		{#if schemaStripped && Object.keys(schemaStripped?.properties ?? {}).length > 0 && (autoRefresh || forceSchemaDisplay)}
+		{#if (autoRefresh || forceSchemaDisplay) && schemaStripped && Object.keys(schemaStripped?.properties ?? {}).length > 0}
 			<div class="px-2 h-fit min-h-0">
 				<LightweightSchemaForm schema={schemaStripped} bind:args />
 			</div>
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
index 7735fc7e76..0a570c07e3 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
@@ -87,9 +87,7 @@
 {#if component}
 	<div class="flex min-h-full flex-col min-w-[150px] w-full divide-y">
 		{#if component.componentInput}
-			<PanelSection
-				title={component.componentInput.fieldType === 'any' ? 'By Runnable' : 'Data Source'}
-			>
+			<PanelSection title="Data Source">
 				<svelte:fragment slot="action">
 					<span
 						class={classNames(
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/triggerLists/ComponentTriggerList.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/triggerLists/ComponentTriggerList.svelte
index 1d0dca5124..8419d77a41 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/triggerLists/ComponentTriggerList.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/triggerLists/ComponentTriggerList.svelte
@@ -23,7 +23,8 @@
 
 	$: onLoad =
 		!onClick ||
-		(appComponent.configuration.triggerOnAppLoad.ctype === undefined &&
+		(appComponent?.configuration?.triggerOnAppLoad != undefined &&
+			appComponent?.configuration?.triggerOnAppLoad?.ctype === undefined &&
 			appComponent.configuration.triggerOnAppLoad.type == 'static' &&
 			appComponent.configuration.triggerOnAppLoad.value)
 </script>