diff --git a/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte b/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
index d1dccb3633..2e92782290 100644
--- a/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
@@ -51,7 +51,7 @@
 
 {#if customCss}
 	{@const property = customCss[key]}
-	{#if property.evalClass}
+	{#if property?.evalClass}
 		<InputValue
 			key={key + extraKey + 'css'}
 			{id}
diff --git a/frontend/src/lib/components/apps/editor/componentsPanel/CssProperty.svelte b/frontend/src/lib/components/apps/editor/componentsPanel/CssProperty.svelte
index 5a4a61d396..b57a3092a1 100644
--- a/frontend/src/lib/components/apps/editor/componentsPanel/CssProperty.svelte
+++ b/frontend/src/lib/components/apps/editor/componentsPanel/CssProperty.svelte
@@ -45,7 +45,7 @@
 		}
 	}
 
-	let dynamicClass: boolean = value.evalClass !== undefined
+	let dynamicClass: boolean = value?.evalClass !== undefined
 </script>
 
 <div class=" border-b flex justify-between items-center p-2 text-xs leading-6 font-bold">
@@ -207,7 +207,7 @@
 			}}
 		/>
 
-		{#if value.evalClass && dynamicClass}
+		{#if value?.evalClass && dynamicClass}
 			<CssEval bind:evalClass={value.evalClass} />
 		{/if}
 	</div>