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 c81fd18116..ee822e2dd4 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
@@ -344,9 +344,8 @@ export class VoiceAssistantsExpose extends LitElement {
         const entry: ExtEntityRegistryEntry | undefined =
           entities[entityState.entity_id];
         const areaId =
-          entry?.area_id ?? entry?.device_id
-            ? devices[entry.device_id!]?.area_id
-            : undefined;
+          entry?.area_id ??
+          (entry?.device_id ? devices[entry.device_id!]?.area_id : undefined);
         const area = areaId ? areas[areaId] : undefined;
 
         result[entityState.entity_id] = {
@@ -405,9 +404,10 @@ export class VoiceAssistantsExpose extends LitElement {
             const entry: ExtEntityRegistryEntry | undefined =
               entities[entityId];
             const areaId =
-              entry?.area_id ?? entry?.device_id
+              entry?.area_id ??
+              (entry?.device_id
                 ? devices[entry.device_id!]?.area_id
-                : undefined;
+                : undefined);
             const area = areaId ? areas[areaId] : undefined;
             result[entityId] = {
               entity_id: entityState.entity_id,