diff --git a/web-src/src/pages/PagePlaylist.vue b/web-src/src/pages/PagePlaylist.vue
index 2ad88ae7..dee41f07 100644
--- a/web-src/src/pages/PagePlaylist.vue
+++ b/web-src/src/pages/PagePlaylist.vue
@@ -69,11 +69,19 @@ export default {
 
   methods: {
     play: function () {
-      webapi.player_play_uri(this.tracks.map(a => a.uri).join(','), true)
+      if (this.playlist.random) {
+        webapi.player_play_uri(this.tracks.map(a => a.uri).join(','), true)
+      } else {
+        webapi.player_play_uri(this.playlist.uri, true)
+      }
     },
 
     play_track: function (position) {
-      webapi.player_play_uri(this.tracks.map(a => a.uri).join(','), false, position)
+      if (this.playlist.random) {
+        webapi.player_play_uri(this.tracks.map(a => a.uri).join(','), false, position)
+      } else {
+        webapi.player_play_uri(this.playlist.uri, false, position)
+      }
     },
 
     open_dialog: function (track) {