diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
index 13a4b70d48..5d6a9eb5f3 100644
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -478,7 +478,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
           area:
             device.area_id && areas[device.area_id]
               ? areas[device.area_id].name
-              : "—",
+              : undefined,
           floor: floorName,
           integration: deviceEntries.length
             ? deviceEntries
@@ -562,6 +562,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
         filterable: true,
         groupable: true,
         minWidth: "120px",
+        template: (device) => device.area || "—",
       },
       floor: {
         title: localize("ui.panel.config.devices.data_table.floor"),
diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
index a62e814090..ce7aa11185 100644
--- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
+++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
@@ -196,6 +196,7 @@ export class VoiceAssistantsExpose extends LitElement {
         sortable: true,
         groupable: true,
         filterable: true,
+        template: (entry) => entry.area || "—",
       },
       assistants: {
         title: localize(
@@ -385,7 +386,7 @@ export class VoiceAssistantsExpose extends LitElement {
               "ui.panel.config.entities.picker.unnamed_entity"
             ),
           domain: domainToName(localize, computeDomain(entityState.entity_id)),
-          area: area ? area.name : "—",
+          area: area ? area.name : undefined,
           assistants: Object.keys(
             exposedEntities?.[entityState.entity_id]
           ).filter(
@@ -433,7 +434,7 @@ export class VoiceAssistantsExpose extends LitElement {
               entity_id: entityState.entity_id,
               entity: entityState,
               name: computeStateName(entityState),
-              area: area ? area.name : "—",
+              area: area ? area.name : undefined,
               assistants: [
                 ...(exposedEntities
                   ? Object.keys(