diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html
index 00b9ebcdd2..a23e06f25d 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.html
@@ -180,7 +180,7 @@
         <paper-icon-button
           class='primary'
           icon='[[computePlaybackControlIcon(playerObj)]]'
-          invisible='[[!computePlaybackControlIcon(playerObj)]]'
+          invisible$='[[!computePlaybackControlIcon(playerObj)]]'
           disabled='[[playerObj.isOff]]'
           on-tap='handlePlaybackControl'
         ></paper-icon-button>
@@ -298,7 +298,7 @@ Polymer({
     if (playerObj.isPlaying) {
       return playerObj.supportsPause ? 'mdi:pause' : 'mdi:stop';
     } else if (playerObj.isPaused || playerObj.isOff || playerObj.isIdle) {
-      return 'mdi:play';
+      return playerObj.supportsPlay ? 'mdi:play' : null;
     }
     return '';
   },
diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 4e5c7e3ce8..800655e299 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -60,7 +60,8 @@
             <paper-icon-button icon='mdi:skip-previous' on-tap='handlePrevious'
               hidden$='[[!supportsPreviousTrack]]'></paper-icon-button>
             <paper-icon-button icon='[[computePlaybackControlIcon(stateObj)]]'
-              on-tap='handlePlaybackControl' highlight></paper-icon-button>
+              on-tap='handlePlaybackControl'
+              hidden$='[[!computePlaybackControlIcon(stateObj)]]' highlight></paper-icon-button>
             <paper-icon-button icon='mdi:skip-next' on-tap='handleNext'
               hidden$='[[!supportsNextTrack]]'></paper-icon-button>
           </template>
@@ -217,6 +218,11 @@ Polymer({
       value: false,
     },
 
+    supportsPlay: {
+      type: Boolean,
+      value: false,
+    },
+
     hasMediaControl: {
       type: Boolean,
       value: false,
@@ -244,6 +250,7 @@ Polymer({
       this.supportsPlayMedia = (newVal.attributes.supported_media_commands & 512) !== 0;
       this.supportsVolumeButtons = (newVal.attributes.supported_media_commands & 1024) !== 0;
       this.supportsSelectSource = (newVal.attributes.supported_media_commands & 2048) !== 0;
+      this.supportsPlay = (newVal.attributes.supported_media_commands & 16384) !== 0;
 
       if (newVal.attributes.source_list !== undefined) {
         this.sourceIndex = newVal.attributes.source_list.indexOf(this.source);
@@ -279,7 +286,7 @@ Polymer({
     if (this.isPlaying) {
       return this.supportsPause ? 'mdi:pause' : 'mdi:stop';
     }
-    return 'mdi:play';
+    return this.supportsPlay ? 'mdi:play' : null;
   },
 
   computeHidePowerButton: function (isOff, supportsTurnOn, supportsTurnOff) {