diff --git a/changes/changelog.d/464.bugfix b/changes/changelog.d/464.bugfix
new file mode 100644
index 000000000..cac26750e
--- /dev/null
+++ b/changes/changelog.d/464.bugfix
@@ -0,0 +1,2 @@
+Do not restart current song when rordering queue, deleting tracks from queue or
+adding tracks to queue (#464)
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index de1adef50..9c918a5fa 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -317,8 +317,8 @@ export default {
     }
   },
   watch: {
-    currentTrack (newValue) {
-      if (!this.isShuffling) {
+    currentTrack (newValue, oldValue) {
+      if (!this.isShuffling && newValue != oldValue) {
         this.audioKey = String(new Date())
       }
       if (!newValue || !newValue.album.cover) {
diff --git a/front/src/components/audio/album/Widget.vue b/front/src/components/audio/album/Widget.vue
index a52a0dc87..1248348c7 100644
--- a/front/src/components/audio/album/Widget.vue
+++ b/front/src/components/audio/album/Widget.vue
@@ -30,7 +30,7 @@
         </div>
         <div class="extra content">
           <human-date class="left floated" :date="album.creation_date"></human-date>
-          <play-button class="right floated basic icon" :dropdown-only="true" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album.id"></play-button>
+          <play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album.id"></play-button>
         </div>
       </div>
     </div>