diff --git a/src/dialogs/more-info/controls/more-info-vacuum.ts b/src/dialogs/more-info/controls/more-info-vacuum.ts
index dfa940e31f..c470b33cba 100644
--- a/src/dialogs/more-info/controls/more-info-vacuum.ts
+++ b/src/dialogs/more-info/controls/more-info-vacuum.ts
@@ -105,36 +105,34 @@ class MoreInfoVacuum extends LitElement {
return html`
${stateObj.state !== UNAVAILABLE
? html`
- ${supportsFeature(stateObj, VacuumEntityFeature.STATUS)
- ? html`
-
- ${this.hass!.localize(
- "ui.dialogs.more_info_control.vacuum.status"
- )}:
-
-
-
- ${computeAttributeValueDisplay(
- this.hass.localize,
- stateObj,
- this.hass.locale,
- this.hass.config,
- this.hass.entities,
- "status"
- ) ||
- computeStateDisplay(
- this.hass.localize,
- stateObj,
- this.hass.locale,
- this.hass.config,
- this.hass.entities
- )}
-
-
-
- `
- : ""}
+
+ ${this.hass!.localize(
+ "ui.dialogs.more_info_control.vacuum.status"
+ )}:
+
+
+
+ ${supportsFeature(stateObj, VacuumEntityFeature.STATUS) &&
+ stateObj.attributes.status
+ ? computeAttributeValueDisplay(
+ this.hass.localize,
+ stateObj,
+ this.hass.locale,
+ this.hass.config,
+ this.hass.entities,
+ "status"
+ )
+ : computeStateDisplay(
+ this.hass.localize,
+ stateObj,
+ this.hass.locale,
+ this.hass.config,
+ this.hass.entities
+ )}
+
+
+
${supportsFeature(stateObj, VacuumEntityFeature.BATTERY) &&
stateObj.attributes.battery_level
? html`