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 2e1fa726cc..3835a30f78 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
@@ -163,7 +163,9 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
             ></ha-icon-button>
           `
         : ""}
-      ${assumedState && supportsFeature(stateObj, SUPPORT_STOP)
+      ${assumedState &&
+      supportsFeature(stateObj, SUPPORT_STOP) &&
+      !supportsFeature(stateObj, SUPPORT_VOLUME_SET)
         ? html`
             <ha-icon-button
               .path=${mdiStop}
@@ -172,7 +174,8 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
             ></ha-icon-button>
           `
         : ""}
-      ${(entityState === "playing" || assumedState) &&
+      ${(entityState === "playing" ||
+        (assumedState && !supportsFeature(stateObj, SUPPORT_VOLUME_SET))) &&
       supportsFeature(stateObj, SUPPORT_NEXT_TRACK)
         ? html`
             <ha-icon-button