From 8be19b87639b0edd2432490e3146dfd977f1862e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 15 Nov 2023 12:58:07 +0100
Subject: [PATCH] fix app freeze

---
 .../components/apps/components/helpers/ResolveStyle.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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>