diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 776f520cd3..04edc7c8db 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -12,7 +12,7 @@
       color: var(--accent-color);
     }
 
-    .volume .volume_buttons {
+    .volume {
       margin-bottom: 8px;
 
       max-height: 0px;
@@ -33,7 +33,7 @@
             hidden$='[[computeHidePowerButton(isOff, supportsTurnOn, supportsTurnOff)]]'></paper-icon-button>
         </div>
         <div>
-          <template is='dom-if' if='[[!isOff]]'>
+          <template is='dom-if' if='[[computeShowPlaybackControls(isOff, hasMediaControl)]]'>
             <paper-icon-button icon='mdi:skip-previous' on-tap='handlePrevious'
               hidden$='[[!supportsPreviousTrack]]'></paper-icon-button>
             <paper-icon-button icon='[[computePlaybackControlIcon(stateObj)]]'
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 4265d3878f..892d3c2632 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -75,6 +75,11 @@ export default new Polymer({
       value: false,
     },
 
+    hasMediaControl: {
+      type: Boolean,
+      value: false,
+    },
+
   },
 
   attached() {
@@ -88,8 +93,11 @@ export default new Polymer({
 
   stateObjChanged(newVal) {
     if (newVal) {
+      const hasMediaStates = ['playing', 'paused', 'unknown'];
+
       this.isOff = newVal.state === 'off';
       this.isPlaying = newVal.state === 'playing';
+      this.hasMediaControl = hasMediaStates.indexOf(newVal.state) !== -1;
       this.volumeSliderValue = newVal.attributes.volume_level * 100;
       this.isMuted = newVal.attributes.is_volume_muted;
       this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0;
@@ -121,6 +129,10 @@ export default new Polymer({
     return !supportsVolumeButtons || isOff;
   },
 
+  computeShowPlaybackControls(isOff, hasMedia) {
+    return !isOff && hasMedia;
+  },
+
   computePlaybackControlIcon() {
     if (this.isPlaying) {
       return this.supportsPause ? 'mdi:pause' : 'mdi:stop';