diff --git a/src/components/ha-selector/ha-selector-media.ts b/src/components/ha-selector/ha-selector-media.ts
index fc998f5d05..bd45f5dec1 100644
--- a/src/components/ha-selector/ha-selector-media.ts
+++ b/src/components/ha-selector/ha-selector-media.ts
@@ -8,7 +8,7 @@ import { getSignedPath } from "../../data/auth";
 import {
   MediaClassBrowserSettings,
   MediaPickedEvent,
-  SUPPORT_BROWSE_MEDIA,
+  MediaPlayerEntityFeature,
 } from "../../data/media-player";
 import type { MediaSelector, MediaSelectorValue } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
@@ -80,7 +80,8 @@ export class HaMediaSelector extends LitElement {
 
     const supportsBrowse =
       !this.value?.entity_id ||
-      (stateObj && supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA));
+      (stateObj &&
+        supportsFeature(stateObj, MediaPlayerEntityFeature.BROWSE_MEDIA));
 
     return html`<ha-entity-picker
         .hass=${this.hass}
diff --git a/src/data/media-player.ts b/src/data/media-player.ts
index 69c03646ec..657b2bbf41 100644
--- a/src/data/media-player.ts
+++ b/src/data/media-player.ts
@@ -76,23 +76,28 @@ export interface MediaPlayerEntity extends HassEntityBase {
     | "unknown";
 }
 
-export const SUPPORT_PAUSE = 1;
-export const SUPPORT_SEEK = 2;
-export const SUPPORT_VOLUME_SET = 4;
-export const SUPPORT_VOLUME_MUTE = 8;
-export const SUPPORT_PREVIOUS_TRACK = 16;
-export const SUPPORT_NEXT_TRACK = 32;
-export const SUPPORT_TURN_ON = 128;
-export const SUPPORT_TURN_OFF = 256;
-export const SUPPORT_PLAY_MEDIA = 512;
-export const SUPPORT_VOLUME_BUTTONS = 1024;
-export const SUPPORT_SELECT_SOURCE = 2048;
-export const SUPPORT_STOP = 4096;
-export const SUPPORT_PLAY = 16384;
-export const SUPPORT_REPEAT_SET = 262144;
-export const SUPPORT_SELECT_SOUND_MODE = 65536;
-export const SUPPORT_SHUFFLE_SET = 32768;
-export const SUPPORT_BROWSE_MEDIA = 131072;
+export const enum MediaPlayerEntityFeature {
+  PAUSE = 1,
+  SEEK = 2,
+  VOLUME_SET = 4,
+  VOLUME_MUTE = 8,
+  PREVIOUS_TRACK = 16,
+  NEXT_TRACK = 32,
+
+  TURN_ON = 128,
+  TURN_OFF = 256,
+  PLAY_MEDIA = 512,
+  VOLUME_BUTTONS = 1024,
+  SELECT_SOURCE = 2048,
+  STOP = 4096,
+  CLEAR_PLAYLIST = 8192,
+  PLAY = 16384,
+  SHUFFLE_SET = 32768,
+  SELECT_SOUND_MODE = 65536,
+  BROWSE_MEDIA = 131072,
+  REPEAT_SET = 262144,
+  GROUPING = 524288,
+}
 
 export type MediaPlayerBrowseAction = "pick" | "play";
 
@@ -264,7 +269,7 @@ export const computeMediaControls = (
   }
 
   if (state === "off") {
-    return supportsFeature(stateObj, SUPPORT_TURN_ON)
+    return supportsFeature(stateObj, MediaPlayerEntityFeature.TURN_ON)
       ? [
           {
             icon: mdiPower,
@@ -276,7 +281,7 @@ export const computeMediaControls = (
 
   const buttons: ControlButton[] = [];
 
-  if (supportsFeature(stateObj, SUPPORT_TURN_OFF)) {
+  if (supportsFeature(stateObj, MediaPlayerEntityFeature.TURN_OFF)) {
     buttons.push({
       icon: mdiPower,
       action: "turn_off",
@@ -288,7 +293,7 @@ export const computeMediaControls = (
 
   if (
     (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_SHUFFLE_SET) &&
+    supportsFeature(stateObj, MediaPlayerEntityFeature.SHUFFLE_SET) &&
     useExtendedControls
   ) {
     buttons.push({
@@ -299,7 +304,7 @@ export const computeMediaControls = (
 
   if (
     (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_PREVIOUS_TRACK)
+    supportsFeature(stateObj, MediaPlayerEntityFeature.PREVIOUS_TRACK)
   ) {
     buttons.push({
       icon: mdiSkipPrevious,
@@ -310,13 +315,13 @@ export const computeMediaControls = (
   if (
     !assumedState &&
     ((state === "playing" &&
-      (supportsFeature(stateObj, SUPPORT_PAUSE) ||
-        supportsFeature(stateObj, SUPPORT_STOP))) ||
+      (supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE) ||
+        supportsFeature(stateObj, MediaPlayerEntityFeature.STOP))) ||
       ((state === "paused" || state === "idle") &&
-        supportsFeature(stateObj, SUPPORT_PLAY)) ||
+        supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY)) ||
       (state === "on" &&
-        (supportsFeature(stateObj, SUPPORT_PLAY) ||
-          supportsFeature(stateObj, SUPPORT_PAUSE))))
+        (supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY) ||
+          supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE))))
   ) {
     buttons.push({
       icon:
@@ -324,33 +329,42 @@ export const computeMediaControls = (
           ? mdiPlayPause
           : state !== "playing"
           ? mdiPlay
-          : supportsFeature(stateObj, SUPPORT_PAUSE)
+          : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
           ? mdiPause
           : mdiStop,
       action:
         state !== "playing"
           ? "media_play"
-          : supportsFeature(stateObj, SUPPORT_PAUSE)
+          : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
           ? "media_pause"
           : "media_stop",
     });
   }
 
-  if (assumedState && supportsFeature(stateObj, SUPPORT_PLAY)) {
+  if (
+    assumedState &&
+    supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY)
+  ) {
     buttons.push({
       icon: mdiPlay,
       action: "media_play",
     });
   }
 
-  if (assumedState && supportsFeature(stateObj, SUPPORT_PAUSE)) {
+  if (
+    assumedState &&
+    supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
+  ) {
     buttons.push({
       icon: mdiPause,
       action: "media_pause",
     });
   }
 
-  if (assumedState && supportsFeature(stateObj, SUPPORT_STOP)) {
+  if (
+    assumedState &&
+    supportsFeature(stateObj, MediaPlayerEntityFeature.STOP)
+  ) {
     buttons.push({
       icon: mdiStop,
       action: "media_stop",
@@ -359,7 +373,7 @@ export const computeMediaControls = (
 
   if (
     (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_NEXT_TRACK)
+    supportsFeature(stateObj, MediaPlayerEntityFeature.NEXT_TRACK)
   ) {
     buttons.push({
       icon: mdiSkipNext,
@@ -369,7 +383,7 @@ export const computeMediaControls = (
 
   if (
     (state === "playing" || state === "paused" || assumedState) &&
-    supportsFeature(stateObj, SUPPORT_REPEAT_SET) &&
+    supportsFeature(stateObj, MediaPlayerEntityFeature.REPEAT_SET) &&
     useExtendedControls
   ) {
     buttons.push({
diff --git a/src/dialogs/more-info/controls/more-info-media_player.ts b/src/dialogs/more-info/controls/more-info-media_player.ts
index 395254d4d4..60839f0d98 100644
--- a/src/dialogs/more-info/controls/more-info-media_player.ts
+++ b/src/dialogs/more-info/controls/more-info-media_player.ts
@@ -25,13 +25,8 @@ import {
   handleMediaControlClick,
   MediaPickedEvent,
   MediaPlayerEntity,
+  MediaPlayerEntityFeature,
   mediaPlayerPlayMedia,
-  SUPPORT_BROWSE_MEDIA,
-  SUPPORT_SELECT_SOUND_MODE,
-  SUPPORT_SELECT_SOURCE,
-  SUPPORT_VOLUME_BUTTONS,
-  SUPPORT_VOLUME_MUTE,
-  SUPPORT_VOLUME_SET,
 } from "../../../data/media-player";
 import { HomeAssistant } from "../../../types";
 
@@ -68,7 +63,7 @@ class MoreInfoMediaPlayer extends LitElement {
                 `
               )}
         </div>
-        ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA)
+        ${supportsFeature(stateObj, MediaPlayerEntityFeature.BROWSE_MEDIA)
           ? html`
               <mwc-button
                 .label=${this.hass.localize(
@@ -85,12 +80,12 @@ class MoreInfoMediaPlayer extends LitElement {
             `
           : ""}
       </div>
-      ${(supportsFeature(stateObj, SUPPORT_VOLUME_SET) ||
-        supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)) &&
+      ${(supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET) ||
+        supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_BUTTONS)) &&
       ![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state)
         ? html`
             <div class="volume">
-              ${supportsFeature(stateObj, SUPPORT_VOLUME_MUTE)
+              ${supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_MUTE)
                 ? html`
                     <ha-icon-button
                       .path=${stateObj.attributes.is_volume_muted
@@ -107,7 +102,10 @@ class MoreInfoMediaPlayer extends LitElement {
                     ></ha-icon-button>
                   `
                 : ""}
-              ${supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)
+              ${supportsFeature(
+                stateObj,
+                MediaPlayerEntityFeature.VOLUME_BUTTONS
+              )
                 ? html`
                     <ha-icon-button
                       action="volume_down"
@@ -127,7 +125,7 @@ class MoreInfoMediaPlayer extends LitElement {
                     ></ha-icon-button>
                   `
                 : ""}
-              ${supportsFeature(stateObj, SUPPORT_VOLUME_SET)
+              ${supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET)
                 ? html`
                     <ha-slider
                       id="input"
@@ -143,7 +141,7 @@ class MoreInfoMediaPlayer extends LitElement {
           `
         : ""}
       ${![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state) &&
-      supportsFeature(stateObj, SUPPORT_SELECT_SOURCE) &&
+      supportsFeature(stateObj, MediaPlayerEntityFeature.SELECT_SOURCE) &&
       stateObj.attributes.source_list?.length
         ? html`
             <div class="source-input">
@@ -168,7 +166,7 @@ class MoreInfoMediaPlayer extends LitElement {
           `
         : ""}
       ${![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state) &&
-      supportsFeature(stateObj, SUPPORT_SELECT_SOUND_MODE) &&
+      supportsFeature(stateObj, MediaPlayerEntityFeature.SELECT_SOUND_MODE) &&
       stateObj.attributes.sound_mode_list?.length
         ? html`
             <div class="sound-input">
diff --git a/src/panels/config/cloud/account/dialog-cloud-tts-try.ts b/src/panels/config/cloud/account/dialog-cloud-tts-try.ts
index b93cbeac21..68e93478f4 100644
--- a/src/panels/config/cloud/account/dialog-cloud-tts-try.ts
+++ b/src/panels/config/cloud/account/dialog-cloud-tts-try.ts
@@ -14,7 +14,7 @@ import "../../../../components/ha-select";
 import "../../../../components/ha-textarea";
 import type { HaTextArea } from "../../../../components/ha-textarea";
 import { showAutomationEditor } from "../../../../data/automation";
-import { SUPPORT_PLAY_MEDIA } from "../../../../data/media-player";
+import { MediaPlayerEntityFeature } from "../../../../data/media-player";
 import { convertTextToSpeech } from "../../../../data/tts";
 import { showAlertDialog } from "../../../../dialogs/generic/show-dialog-box";
 import { haStyleDialog } from "../../../../resources/styles";
@@ -94,7 +94,7 @@ export class DialogTryTts extends LitElement {
               .filter(
                 (entity) =>
                   computeStateDomain(entity) === "media_player" &&
-                  supportsFeature(entity, SUPPORT_PLAY_MEDIA)
+                  supportsFeature(entity, MediaPlayerEntityFeature.PLAY_MEDIA)
               )
               .map(
                 (entity) => html`
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index 8f2f47303f..05d6faf3b2 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -31,10 +31,8 @@ import {
   handleMediaControlClick,
   MediaPickedEvent,
   MediaPlayerEntity,
+  MediaPlayerEntityFeature,
   mediaPlayerPlayMedia,
-  SUPPORT_BROWSE_MEDIA,
-  SUPPORT_SEEK,
-  SUPPORT_TURN_ON,
 } from "../../../data/media-player";
 import type { HomeAssistant } from "../../../types";
 import { findEntities } from "../common/find-entities";
@@ -174,7 +172,8 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
     const isOffState = entityState === "off";
     const isUnavailable =
       isUnavailableState(entityState) ||
-      (entityState === "off" && !supportsFeature(stateObj, SUPPORT_TURN_ON));
+      (entityState === "off" &&
+        !supportsFeature(stateObj, MediaPlayerEntityFeature.TURN_ON));
     const hasNoImage = !this._image;
     const controls = computeMediaControls(stateObj, false);
     const showControls =
@@ -282,7 +281,10 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
                                 </ha-icon-button>
                               `
                             )}
-                            ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA)
+                            ${supportsFeature(
+                              stateObj,
+                              MediaPlayerEntityFeature.BROWSE_MEDIA
+                            )
                               ? html`
                                   <ha-icon-button
                                     class="browse-media"
@@ -305,7 +307,10 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
                           style=${styleMap({
                             "--mdc-theme-primary":
                               this._foregroundColor || "var(--accent-color)",
-                            cursor: supportsFeature(stateObj, SUPPORT_SEEK)
+                            cursor: supportsFeature(
+                              stateObj,
+                              MediaPlayerEntityFeature.SEEK
+                            )
                               ? "pointer"
                               : "initial",
                           })}
@@ -522,7 +527,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
   private _handleSeek(e: MouseEvent): void {
     const stateObj = this._stateObj!;
 
-    if (!supportsFeature(stateObj, SUPPORT_SEEK)) {
+    if (!supportsFeature(stateObj, MediaPlayerEntityFeature.SEEK)) {
       return;
     }
 
diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
index 3835a30f78..1de6ab4d11 100644
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -32,16 +32,7 @@ import {
   computeMediaDescription,
   ControlButton,
   MediaPlayerEntity,
-  SUPPORT_NEXT_TRACK,
-  SUPPORT_PAUSE,
-  SUPPORT_PLAY,
-  SUPPORT_PREVIOUS_TRACK,
-  SUPPORT_STOP,
-  SUPPORT_TURN_OFF,
-  SUPPORT_TURN_ON,
-  SUPPORT_VOLUME_BUTTONS,
-  SUPPORT_VOLUME_MUTE,
-  SUPPORT_VOLUME_SET,
+  MediaPlayerEntityFeature,
 } from "../../../data/media-player";
 import type { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";
@@ -115,7 +106,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
     const buttons = html`
       ${!this._narrow &&
       (entityState === "playing" || assumedState) &&
-      supportsFeature(stateObj, SUPPORT_PREVIOUS_TRACK)
+      supportsFeature(stateObj, MediaPlayerEntityFeature.PREVIOUS_TRACK)
         ? html`
             <ha-icon-button
               .path=${mdiSkipPrevious}
@@ -128,13 +119,13 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
         : ""}
       ${!assumedState &&
       ((entityState === "playing" &&
-        (supportsFeature(stateObj, SUPPORT_PAUSE) ||
-          supportsFeature(stateObj, SUPPORT_STOP))) ||
+        (supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE) ||
+          supportsFeature(stateObj, MediaPlayerEntityFeature.STOP))) ||
         ((entityState === "paused" || entityState === "idle") &&
-          supportsFeature(stateObj, SUPPORT_PLAY)) ||
+          supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY)) ||
         (entityState === "on" &&
-          (supportsFeature(stateObj, SUPPORT_PLAY) ||
-            supportsFeature(stateObj, SUPPORT_PAUSE))))
+          (supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY) ||
+            supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE))))
         ? html`
             <ha-icon-button
               .path=${controlButton.icon}
@@ -145,7 +136,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
             ></ha-icon-button>
           `
         : ""}
-      ${assumedState && supportsFeature(stateObj, SUPPORT_PLAY)
+      ${assumedState && supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY)
         ? html`
             <ha-icon-button
               .path=${mdiPlay}
@@ -154,7 +145,8 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
             ></ha-icon-button>
           `
         : ""}
-      ${assumedState && supportsFeature(stateObj, SUPPORT_PAUSE)
+      ${assumedState &&
+      supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
         ? html`
             <ha-icon-button
               .path=${mdiPause}
@@ -164,8 +156,8 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
           `
         : ""}
       ${assumedState &&
-      supportsFeature(stateObj, SUPPORT_STOP) &&
-      !supportsFeature(stateObj, SUPPORT_VOLUME_SET)
+      supportsFeature(stateObj, MediaPlayerEntityFeature.STOP) &&
+      !supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET)
         ? html`
             <ha-icon-button
               .path=${mdiStop}
@@ -175,8 +167,9 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
           `
         : ""}
       ${(entityState === "playing" ||
-        (assumedState && !supportsFeature(stateObj, SUPPORT_VOLUME_SET))) &&
-      supportsFeature(stateObj, SUPPORT_NEXT_TRACK)
+        (assumedState &&
+          !supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET))) &&
+      supportsFeature(stateObj, MediaPlayerEntityFeature.NEXT_TRACK)
         ? html`
             <ha-icon-button
               .path=${mdiSkipNext}
@@ -204,7 +197,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
         )}
       >
         <div class="controls">
-          ${supportsFeature(stateObj, SUPPORT_TURN_ON) &&
+          ${supportsFeature(stateObj, MediaPlayerEntityFeature.TURN_ON) &&
           entityState === "off" &&
           !isUnavailableState(entityState)
             ? html`
@@ -214,11 +207,14 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
                   @click=${this._togglePower}
                 ></ha-icon-button>
               `
-            : !supportsFeature(stateObj, SUPPORT_VOLUME_SET) &&
-              !supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)
+            : !supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET) &&
+              !supportsFeature(
+                stateObj,
+                MediaPlayerEntityFeature.VOLUME_BUTTONS
+              )
             ? buttons
             : ""}
-          ${supportsFeature(stateObj, SUPPORT_TURN_OFF) &&
+          ${supportsFeature(stateObj, MediaPlayerEntityFeature.TURN_OFF) &&
           entityState !== "off" &&
           !isUnavailableState(entityState)
             ? html`
@@ -231,13 +227,16 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
             : ""}
         </div>
       </hui-generic-entity-row>
-      ${(supportsFeature(stateObj, SUPPORT_VOLUME_SET) ||
-        supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)) &&
+      ${(supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET) ||
+        supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_BUTTONS)) &&
       ![UNAVAILABLE, UNKNOWN, "off"].includes(entityState)
         ? html`
             <div class="flex">
               <div class="volume">
-                ${supportsFeature(stateObj, SUPPORT_VOLUME_MUTE)
+                ${supportsFeature(
+                  stateObj,
+                  MediaPlayerEntityFeature.VOLUME_MUTE
+                )
                   ? html`
                       <ha-icon-button
                         .path=${stateObj.attributes.is_volume_muted
@@ -255,7 +254,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
                     `
                   : ""}
                 ${!this._veryNarrow &&
-                supportsFeature(stateObj, SUPPORT_VOLUME_SET)
+                supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET)
                   ? html`
                       <ha-slider
                         .dir=${computeRTLDirection(this.hass!)}
@@ -267,7 +266,10 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
                       ></ha-slider>
                     `
                   : !this._veryNarrow &&
-                    supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)
+                    supportsFeature(
+                      stateObj,
+                      MediaPlayerEntityFeature.VOLUME_BUTTONS
+                    )
                   ? html`
                       <ha-icon-button
                         .path=${mdiVolumeMinus}
@@ -317,7 +319,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
       ? { icon: mdiPlayPause, action: "media_play_pause" }
       : stateObj.state !== "playing"
       ? { icon: mdiPlay, action: "media_play" }
-      : supportsFeature(stateObj, SUPPORT_PAUSE)
+      : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
       ? { icon: mdiPause, action: "media_pause" }
       : { icon: mdiStop, action: "media_stop" };
   }
@@ -340,7 +342,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
     const service =
       stateObj.state !== "playing"
         ? "media_play"
-        : supportsFeature(stateObj, SUPPORT_PAUSE)
+        : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
         ? "media_pause"
         : "media_stop";
 
diff --git a/src/panels/media-browser/browser-media-player.ts b/src/panels/media-browser/browser-media-player.ts
index c4c4bddc22..53aa891a7b 100644
--- a/src/panels/media-browser/browser-media-player.ts
+++ b/src/panels/media-browser/browser-media-player.ts
@@ -1,10 +1,8 @@
 import {
   BROWSER_PLAYER,
   MediaPlayerEntity,
+  MediaPlayerEntityFeature,
   MediaPlayerItem,
-  SUPPORT_PAUSE,
-  SUPPORT_PLAY,
-  SUPPORT_VOLUME_SET,
 } from "../../data/media-player";
 import { ResolvedMediaSource } from "../../data/media_source";
 import { HomeAssistant } from "../../types";
@@ -96,8 +94,12 @@ export class BrowserMediaPlayer {
       media_title: this.item.title,
       entity_picture: this.item.thumbnail,
       volume_level: this.player.volume,
-      // eslint-disable-next-line no-bitwise
-      supported_features: SUPPORT_PLAY | SUPPORT_PAUSE | SUPPORT_VOLUME_SET,
+      supported_features:
+        // eslint-disable-next-line no-bitwise
+        MediaPlayerEntityFeature.PLAY |
+        // eslint-disable-next-line no-bitwise
+        MediaPlayerEntityFeature.PAUSE |
+        MediaPlayerEntityFeature.VOLUME_SET,
     };
 
     if (this.player.duration) {
diff --git a/src/panels/media-browser/ha-bar-media-player.ts b/src/panels/media-browser/ha-bar-media-player.ts
index 6f501099a3..17e2986ab5 100644
--- a/src/panels/media-browser/ha-bar-media-player.ts
+++ b/src/panels/media-browser/ha-bar-media-player.ts
@@ -29,8 +29,8 @@ import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { domainIcon } from "../../common/entity/domain_icon";
 import { supportsFeature } from "../../common/entity/supports-feature";
-import "../../components/ha-button-menu";
 import "../../components/ha-button";
+import "../../components/ha-button-menu";
 import "../../components/ha-circular-progress";
 import "../../components/ha-icon-button";
 import { UNAVAILABLE } from "../../data/entity";
@@ -45,13 +45,9 @@ import {
   getCurrentProgress,
   handleMediaControlClick,
   MediaPlayerEntity,
+  MediaPlayerEntityFeature,
   MediaPlayerItem,
   setMediaPlayerVolume,
-  SUPPORT_BROWSE_MEDIA,
-  SUPPORT_PAUSE,
-  SUPPORT_PLAY,
-  SUPPORT_STOP,
-  SUPPORT_VOLUME_SET,
 } from "../../data/media-player";
 import { ResolvedMediaSource } from "../../data/media_source";
 import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
@@ -184,13 +180,13 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
     const controls: ControlButton[] | undefined = !this.narrow
       ? computeMediaControls(stateObj, true)
       : (stateObj.state === "playing" &&
-          (supportsFeature(stateObj, SUPPORT_PAUSE) ||
-            supportsFeature(stateObj, SUPPORT_STOP))) ||
+          (supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE) ||
+            supportsFeature(stateObj, MediaPlayerEntityFeature.STOP))) ||
         ((stateObj.state === "paused" || stateObj.state === "idle") &&
-          supportsFeature(stateObj, SUPPORT_PLAY)) ||
+          supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY)) ||
         (stateObj.state === "on" &&
-          (supportsFeature(stateObj, SUPPORT_PLAY) ||
-            supportsFeature(stateObj, SUPPORT_PAUSE)))
+          (supportsFeature(stateObj, MediaPlayerEntityFeature.PLAY) ||
+            supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)))
       ? [
           {
             icon:
@@ -198,13 +194,13 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
                 ? mdiPlayPause
                 : stateObj.state !== "playing"
                 ? mdiPlay
-                : supportsFeature(stateObj, SUPPORT_PAUSE)
+                : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
                 ? mdiPause
                 : mdiStop,
             action:
               stateObj.state !== "playing"
                 ? "media_play"
-                : supportsFeature(stateObj, SUPPORT_PAUSE)
+                : supportsFeature(stateObj, MediaPlayerEntityFeature.PAUSE)
                 ? "media_pause"
                 : "media_stop",
           },
@@ -292,7 +288,7 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
       ${
         !this.narrow &&
         stateObj &&
-        supportsFeature(stateObj, SUPPORT_VOLUME_SET)
+        supportsFeature(stateObj, MediaPlayerEntityFeature.VOLUME_SET)
           ? html`
               <ha-button-menu corner="BOTTOM_START" y="0" x="76">
                 <ha-icon-button
@@ -470,7 +466,7 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
     return Object.values(this.hass!.states).filter(
       (entity) =>
         computeStateDomain(entity) === "media_player" &&
-        supportsFeature(entity, SUPPORT_BROWSE_MEDIA) &&
+        supportsFeature(entity, MediaPlayerEntityFeature.BROWSE_MEDIA) &&
         !this._hiddenEntities.has(entity.entity_id)
     );
   }