diff --git a/src/components/entity/ha-entity-toggle.ts b/src/components/entity/ha-entity-toggle.ts
index 67549ca090..13c269a114 100644
--- a/src/components/entity/ha-entity-toggle.ts
+++ b/src/components/entity/ha-entity-toggle.ts
@@ -12,7 +12,7 @@ import {
 import { STATES_OFF } from "../../common/const";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
-import { UNAVAILABLE_STATES } from "../../data/entity";
+import { UNAVAILABLE_STATES, UNAVAILABLE } from "../../data/entity";
 import { forwardHaptic } from "../../data/haptics";
 import { HomeAssistant } from "../../types";
 import "../ha-switch";
@@ -40,14 +40,14 @@ class HaEntityToggle extends LitElement {
         <paper-icon-button
           aria-label=${`Turn ${computeStateName(this.stateObj)} off`}
           icon="hass:flash-off"
-          .disabled=${UNAVAILABLE_STATES.includes(this.stateObj.state)}
+          .disabled=${this.stateObj.state === UNAVAILABLE}
           @click=${this._turnOff}
           ?state-active=${!this._isOn}
         ></paper-icon-button>
         <paper-icon-button
           aria-label=${`Turn ${computeStateName(this.stateObj)} on`}
           icon="hass:flash"
-          .disabled=${UNAVAILABLE_STATES.includes(this.stateObj.state)}
+          .disabled=${this.stateObj.state === UNAVAILABLE}
           @click=${this._turnOn}
           ?state-active=${this._isOn}
         ></paper-icon-button>
diff --git a/src/components/ha-cover-controls.js b/src/components/ha-cover-controls.js
index 0e7eb841e8..2768484d3b 100644
--- a/src/components/ha-cover-controls.js
+++ b/src/components/ha-cover-controls.js
@@ -2,7 +2,7 @@ import "@polymer/paper-icon-button/paper-icon-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { UNAVAILABLE_STATES } from "../data/entity";
+import { UNAVAILABLE } from "../data/entity";
 import CoverEntity from "../util/cover-model";
 
 class HaCoverControls extends PolymerElement {
@@ -30,6 +30,7 @@ class HaCoverControls extends PolymerElement {
           icon="hass:stop"
           on-click="onStopTap"
           invisible$="[[!entityObj.supportsStop]]"
+          disabled="[[computStopDisabled(stateObj)]]"
         ></paper-icon-button>
         <paper-icon-button
           aria-label="Close cover"
@@ -81,8 +82,15 @@ class HaCoverControls extends PolymerElement {
     }
   }
 
+  computeStopDisabled(stateObj) {
+    if (stateObj.state === UNAVAILABLE) {
+      return true;
+    }
+    return false;
+  }
+
   computeOpenDisabled(stateObj, entityObj) {
-    if (UNAVAILABLE_STATES.includes(stateObj.state)) {
+    if (stateObj.state === UNAVAILABLE) {
       return true;
     }
     var assumedState = stateObj.attributes.assumed_state === true;
@@ -90,7 +98,7 @@ class HaCoverControls extends PolymerElement {
   }
 
   computeClosedDisabled(stateObj, entityObj) {
-    if (UNAVAILABLE_STATES.includes(stateObj.state)) {
+    if (stateObj.state === UNAVAILABLE) {
       return true;
     }
     var assumedState = stateObj.attributes.assumed_state === true;
diff --git a/src/components/ha-cover-tilt-controls.js b/src/components/ha-cover-tilt-controls.js
index 399915c75a..b3328963ce 100644
--- a/src/components/ha-cover-tilt-controls.js
+++ b/src/components/ha-cover-tilt-controls.js
@@ -3,7 +3,7 @@ import "@polymer/paper-icon-button/paper-icon-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { UNAVAILABLE_STATES } from "../data/entity";
+import { UNAVAILABLE } from "../data/entity";
 import CoverEntity from "../util/cover-model";
 
 class HaCoverTiltControls extends PolymerElement {
@@ -31,6 +31,7 @@ class HaCoverTiltControls extends PolymerElement {
         icon="hass:stop"
         on-click="onStopTiltTap"
         invisible$="[[!entityObj.supportsStopTilt]]"
+        disabled="[[computStopDisabled(stateObj)]]"
         title="Stop tilt"
       ></paper-icon-button>
       <paper-icon-button
@@ -63,8 +64,15 @@ class HaCoverTiltControls extends PolymerElement {
     return new CoverEntity(hass, stateObj);
   }
 
+  computeStopDisabled(stateObj) {
+    if (stateObj.state === UNAVAILABLE) {
+      return true;
+    }
+    return false;
+  }
+
   computeOpenDisabled(stateObj, entityObj) {
-    if (UNAVAILABLE_STATES.includes(stateObj.state)) {
+    if (stateObj.state === UNAVAILABLE) {
       return true;
     }
     var assumedState = stateObj.attributes.assumed_state === true;
@@ -72,7 +80,7 @@ class HaCoverTiltControls extends PolymerElement {
   }
 
   computeClosedDisabled(stateObj, entityObj) {
-    if (UNAVAILABLE_STATES.includes(stateObj.state)) {
+    if (stateObj.state === UNAVAILABLE) {
       return true;
     }
     var assumedState = stateObj.attributes.assumed_state === true;