diff --git a/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte b/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
index 8cabb973bc..cc9fcbb07f 100644
--- a/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/ResolveStyle.svelte
@@ -39,12 +39,12 @@
 	$: updateCss(componentStyle, customCss, evalClassValue, evalClassValueGlobal)
 
 	// We need to clear the evalClassValue if the user has disabled the evalClass
-	$: if (customCss?.[key].evalClass === undefined && evalClassValue !== undefined) {
+	$: if (customCss?.[key]?.evalClass === undefined && evalClassValue !== undefined) {
 		evalClassValue = undefined
 	}
 
 	// We need to clear the evalClassValue if the user has disabled the evalClass
-	$: if (componentStyle?.[key].evalClass === undefined && evalClassValueGlobal !== undefined) {
+	$: if (componentStyle?.[key]?.evalClass === undefined && evalClassValueGlobal !== undefined) {
 		evalClassValueGlobal = undefined
 	}
 </script>