diff --git a/src/lib/components/autocomplete/Autocomplete.svelte b/src/lib/components/autocomplete/Autocomplete.svelte
index 6a0a017..9050f8b 100644
--- a/src/lib/components/autocomplete/Autocomplete.svelte
+++ b/src/lib/components/autocomplete/Autocomplete.svelte
@@ -97,7 +97,7 @@
 	setContext('autocomplete-mobile', isMobile);
 	setContext('autocomplete-actual-value', value);
 
-	const finalClass = twMerge(defaultClass, $$props.class);
+	$: finalClass = twMerge(defaultClass, $$props.class);
 </script>
 
 <div
diff --git a/src/lib/components/currency/Currency.svelte b/src/lib/components/currency/Currency.svelte
index 84e4282..e01de31 100644
--- a/src/lib/components/currency/Currency.svelte
+++ b/src/lib/components/currency/Currency.svelte
@@ -43,11 +43,9 @@
 		value = undefined;
 	}
 
-	const finalClass = twMerge(
-		'stwui-currency-wrapper',
+	const defaultClass = 'stwui-currency-wrapper';
 
-		$$props.class
-	);
+	$: finalClass = twMerge(defaultClass, $$props.class);
 
 	setContext('currency-name', name);
 	setContext('currency-error', currentError);
diff --git a/src/lib/components/datepicker/DateInput.svelte b/src/lib/components/datepicker/DateInput.svelte
index 3559abc..a90a3fa 100644
--- a/src/lib/components/datepicker/DateInput.svelte
+++ b/src/lib/components/datepicker/DateInput.svelte
@@ -124,11 +124,8 @@
 	setContext('datepicker-name', name);
 	setContext('datepicker-error', currentError);
 
-	const finalClass = twMerge(
-		'stwui-datepicker-wrapper',
-
-		$$props.class
-	);
+	const defaultClass = 'stwui-datepicker-wrapper';
+	$: finalClass = twMerge(defaultClass, $$props.class);
 
 	onMount(() => {
 		valueDayJS = value === null ? null : dayjs(value);
diff --git a/src/lib/components/input-number/InputNumber.svelte b/src/lib/components/input-number/InputNumber.svelte
index 30ef437..87931ea 100644
--- a/src/lib/components/input-number/InputNumber.svelte
+++ b/src/lib/components/input-number/InputNumber.svelte
@@ -62,11 +62,8 @@
 		}
 	}
 
-	const finalClass = twMerge(
-		'stwui-input-number',
-
-		$$props.class
-	);
+	const defaultClass = 'stwui-input-number';
+	$: finalClass = twMerge(defaultClass, $$props.class);
 
 	setContext('input-number-name', name);
 	setContext('input-number-error', currentError);