diff --git a/src/components/spans/individualSecondarySpan.ts b/src/components/spans/individualSecondarySpan.ts
index b358b505..76862d1b 100644
--- a/src/components/spans/individualSecondarySpan.ts
+++ b/src/components/spans/individualSecondarySpan.ts
@@ -24,7 +24,7 @@ export const individualSecondarySpan = (
   const value = individual?.secondary?.has
     ? displayValue(hass, config, individual?.secondary?.state, {
         unit: individual?.secondary?.unit || undefined,
-        unitWhiteSpace: individual?.secondary?.unit_white_space,
+        unitWhiteSpace: individual.secondary.unit_white_space,
         decimals: individual?.secondary?.decimals || 0,
         accept_negative: individual?.secondary?.accept_negative || false,
         watt_threshold: config.watt_threshold,
diff --git a/src/states/raw/individual/getIndividualObject.ts b/src/states/raw/individual/getIndividualObject.ts
index 7cce34e7..29bced2f 100644
--- a/src/states/raw/individual/getIndividualObject.ts
+++ b/src/states/raw/individual/getIndividualObject.ts
@@ -87,7 +87,7 @@ export const getIndividualObject = (hass: HomeAssistant, field: IndividualDevice
     name: computeFieldName(hass, field, "Individual"),
     color,
     unit: field?.unit_of_measurement,
-    unit_white_space: field?.unit_white_space || false,
+    unit_white_space: field?.unit_white_space !== false,
     decimals: field?.decimals,
     invertAnimation,
     showDirection: field?.show_direction || false,
@@ -99,7 +99,7 @@ export const getIndividualObject = (hass: HomeAssistant, field: IndividualDevice
       accept_negative: field?.secondary_info?.accept_negative || false,
       icon: field?.secondary_info?.icon || null,
       unit: field?.secondary_info?.unit_of_measurement || null,
-      unit_white_space: field?.secondary_info?.unit_white_space || false,
+      unit_white_space: field?.secondary_info?.unit_white_space !== false,
       displayZero: field?.secondary_info?.display_zero || false,
       displayZeroTolerance: field?.secondary_info?.display_zero_tolerance || 0,
       decimals: field?.secondary_info?.decimals || null,