diff --git a/src/components/Playlist.vue b/src/components/Playlist.vue
index 4622bde1..35ace3ed 100644
--- a/src/components/Playlist.vue
+++ b/src/components/Playlist.vue
@@ -69,6 +69,11 @@ export default {
         async getPlaylistData() {
             this.fetchPlaylist()
                 .then(data => (this.playlist = data))
+                .then(() =>
+                    this.playlist.relatedStreams.forEach(video => {
+                        video.url += "&list=" + this.$route.query.list;
+                    }),
+                )
                 .then(() => (document.title = this.playlist.name + " - Piped"));
         },
         handleScroll() {
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index b4ea7d28..2f472e3d 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -131,7 +131,7 @@
                     {{ showRecs ? $t("actions.minimize_recommendations") : $t("actions.show_recommendations") }}
                 </a>
                 <div
-                    v-for="related in video.relatedStreams"
+                    v-for="related in isPlaylist ? playlist.relatedStreams : video.relatedStreams"
                     v-show="showRecs || !smallView"
                     :key="related.url"
                     class="uk-tile-default uk-width-auto"
@@ -165,6 +165,9 @@ export default {
             video: {
                 title: "Loading...",
             },
+            playlist: {
+                title: "Loading...",
+            },
             sponsors: null,
             selectedAutoLoop: false,
             selectedAutoPlay: null,
@@ -190,6 +193,9 @@ export default {
         isEmbed(_this) {
             return String(_this.$route.path).indexOf("/embed/") == 0;
         },
+        isPlaylist(_this) {
+            return _this.$route.query.list;
+        },
         uploadDate(_this) {
             return new Date(_this.video.uploadDate).toLocaleString(undefined, {
                 month: "short",
@@ -228,6 +234,7 @@ export default {
             })();
             if (this.active) this.$refs.videoPlayer.loadVideo();
         });
+        this.getPlaylistData();
         this.getSponsors();
         if (!this.isEmbed && this.getPreferenceBoolean("comments", true)) this.getComments();
         window.addEventListener("resize", () => {
@@ -266,6 +273,14 @@ export default {
                     '"]',
             });
         },
+        async fetchPlaylist() {
+            return await await this.fetchJson(this.apiUrl() + "/playlists/" + this.$route.query.list);
+        },
+        async getPlaylistData() {
+            this.fetchPlaylist()
+                .then(data => (this.playlist = data))
+                .then(() => (document.title = this.playlist.name + " - Piped"));
+        },
         fetchComments() {
             return this.fetchJson(this.apiUrl() + "/comments/" + this.getVideoId());
         },