diff --git a/src/components/PreferencesPage.vue b/src/components/PreferencesPage.vue
index 65a381f763..841bd68fc4 100644
--- a/src/components/PreferencesPage.vue
+++ b/src/components/PreferencesPage.vue
@@ -45,6 +45,42 @@
             @change="onChange($event)"
         />
     </label>
+    <details v-bind:class="{ details: autoPlayNextVideo }" open>
+        <summary class="pref">
+            <label class="w-full flex items-center justify-between" for="chkAutoPlayNextVideo">
+                <strong v-t="'actions.auto_play_next_video'" />
+                <input
+                    id="chkAutoPlayNextVideo"
+                    v-model="autoPlayNextVideo"
+                    class="checkbox"
+                    type="checkbox"
+                    @change="onChange($event)"
+                />
+            </label>
+        </summary>
+        <div class="pl-4">
+            <label v-if="autoPlayNextVideo" class="pref" for="chkAutoPlayPreferUnwatched">
+                <strong v-t="'actions.autoplay_prefer_unwatched'" />
+                <input
+                    id="chkAutoPlayPreferUnwatched"
+                    v-model="autoPlayPreferUnwatched"
+                    class="checkbox"
+                    type="checkbox"
+                    @change="onChange($event)"
+                />
+            </label>
+            <label v-if="autoPlayNextVideo" class="pref" for="chkAutoPlayPreferSameAuthor">
+                <strong v-t="'actions.autoplay_prefer_same_author'" />
+                <input
+                    id="chkAutoPlayPreferSameAuthor"
+                    v-model="autoPlayPreferSameAuthor"
+                    class="checkbox"
+                    type="checkbox"
+                    @change="onChange($event)"
+                />
+            </label>
+        </div>
+    </details>
     <label class="pref" for="chkAudioOnly">
         <strong v-t="'actions.audio_only'" />
         <input id="chkAudioOnly" v-model="listen" class="checkbox" type="checkbox" @change="onChange($event)" />
@@ -346,6 +382,9 @@ export default {
             minSegmentLength: 0,
             selectedTheme: "dark",
             autoPlayVideo: true,
+            autoPlayNextVideo: true,
+            autoPlayPreferUnwatched: true,
+            autoPlayPreferSameAuthor: false,
             listen: false,
             resolutions: [144, 240, 360, 480, 720, 1080, 1440, 2160, 4320],
             defaultQuality: 0,
@@ -461,6 +500,9 @@ export default {
             this.minSegmentLength = Math.max(this.getPreferenceNumber("minSegmentLength", 0), 0);
             this.selectedTheme = this.getPreferenceString("theme", "dark");
             this.autoPlayVideo = this.getPreferenceBoolean("playerAutoPlay", true);
+            this.autoPlayNextVideo = this.getPreferenceBoolean("autoplay", true);
+            this.autoPlayPreferUnwatched = this.getPreferenceBoolean("autoPlayUnwatched", true);
+            this.autoPlayPreferSameAuthor = this.getPreferenceBoolean("autoPlaySameAuthor", false);
             this.listen = this.getPreferenceBoolean("listen", false);
             this.defaultQuality = Number(localStorage.getItem("quality"));
             this.bufferingGoal = Math.max(Number(localStorage.getItem("bufferGoal")), 10);
@@ -515,6 +557,9 @@ export default {
                 localStorage.setItem("minSegmentLength", this.minSegmentLength);
                 localStorage.setItem("theme", this.selectedTheme);
                 localStorage.setItem("playerAutoPlay", this.autoPlayVideo);
+                localStorage.setItem("autoplay", this.autoPlayNextVideo);
+                localStorage.setItem("autoPlayUnwatched", this.autoPlayPreferUnwatched);
+                localStorage.setItem("autoPlaySameAuthor", this.autoPlayPreferSameAuthor);
                 localStorage.setItem("listen", this.listen);
                 localStorage.setItem("quality", this.defaultQuality);
                 localStorage.setItem("bufferGoal", this.bufferingGoal);
@@ -602,4 +647,23 @@ export default {
 .pref {
     @apply flex justify-between items-center my-2 mx-[15vw] lt-md:mx-[2vw];
 }
+.details summary {
+    @apply pl-4 relative cursor-pointer;
+}
+.details summary:before {
+    content: "";
+    border-width: 0.4rem;
+    border-style: solid;
+    border-color: transparent transparent transparent #fff;
+    position: absolute;
+    top: 0.4rem;
+    left: 0;
+    margin-right: 1rem;
+    transform: rotate(0);
+    transform-origin: 0.2rem 50%;
+    transition: 0.25s transform ease;
+}
+details[open] > summary:before {
+    transform: rotate(90deg);
+}
 </style>
diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue
index 148fb0dbea..dd2ac58305 100644
--- a/src/components/VideoPlayer.vue
+++ b/src/components/VideoPlayer.vue
@@ -38,6 +38,12 @@ export default {
                 return {};
             },
         },
+        nextVideo: {
+            type: Object,
+            default: () => {
+                return {};
+            },
+        },
         playlist: {
             type: Object,
             default: null,
@@ -611,7 +617,8 @@ export default {
         },
         navigateNext() {
             const params = this.$route.query;
-            let url = this.playlist?.relatedStreams?.[this.index]?.url ?? this.video.relatedStreams[0].url;
+            const relatedUrl = this.nextVideo?.url ?? this.video.relatedStreams[0].url;
+            let url = this.playlist?.relatedStreams?.[this.index]?.url ?? relatedUrl;
             const searchParams = new URLSearchParams();
             for (var param in params)
                 switch (param) {
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index db1a3e30da..69cb8e4380 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -20,6 +20,7 @@
                 <VideoPlayer
                     ref="videoPlayer"
                     :video="video"
+                    :next-video="nextVideo"
                     :sponsors="sponsors"
                     :playlist="playlist"
                     :index="index"
@@ -206,8 +207,12 @@
                 />
                 <hr v-show="showRecs" />
                 <div v-show="showRecs">
+                    <div v-if="nextVideo" class="">
+                        <p v-t="'video.next_up'" />
+                        <VideoItem :key="nextVideo.url" :item="nextVideo" height="94" width="168" />
+                    </div>
                     <ContentItem
-                        v-for="related in video.relatedStreams"
+                        v-for="related in filteredRelatedStreams"
                         :key="related.url"
                         :item="related"
                         height="94"
@@ -230,6 +235,7 @@ import PlaylistAddModal from "./PlaylistAddModal.vue";
 import ShareModal from "./ShareModal.vue";
 import PlaylistVideos from "./PlaylistVideos.vue";
 import WatchOnYouTubeButton from "./WatchOnYouTubeButton.vue";
+import VideoItem from "./VideoItem.vue";
 
 export default {
     name: "App",
@@ -243,6 +249,7 @@ export default {
         ShareModal,
         PlaylistVideos,
         WatchOnYouTubeButton,
+        VideoItem,
     },
     data() {
         const smallViewQuery = window.matchMedia("(max-width: 640px)");
@@ -250,6 +257,7 @@ export default {
             video: {
                 title: "Loading...",
             },
+            nextVideo: null,
             playlistId: null,
             playlist: null,
             index: null,
@@ -291,6 +299,15 @@ export default {
                 year: "numeric",
             });
         },
+        filteredRelatedStreams: _this => {
+            return _this.video.relatedStreams?.filter(video => video.url !== _this.nextVideo?.url);
+        },
+        preferUnwatched: _this => {
+            return _this.getPreferenceBoolean("autoPlayUnwatched", true) && !_this.isEmbed;
+        },
+        preferAuthor: _this => {
+            return _this.getPreferenceBoolean("autoPlaySameAuthor", false) && !_this.isEmbed;
+        },
     },
     mounted() {
         // check screen size
@@ -425,7 +442,13 @@ export default {
                         });
                         xmlDoc.querySelectorAll("br").forEach(elem => (elem.outerHTML = "\n"));
                         this.video.description = this.rewriteDescription(xmlDoc.querySelector("body").innerHTML);
-                        this.updateWatched(this.video.relatedStreams);
+                        this.updateWatched(this.video.relatedStreams).then(() => {
+                            if (!this.isEmbed) {
+                                if (!this.playlistId) {
+                                    this.setNextVideo();
+                                }
+                            }
+                        });
                     }
                 });
         },
@@ -560,6 +583,37 @@ export default {
         onTimeUpdate(time) {
             this.currentTime = time;
         },
+        setNextVideo() {
+            if (!this.preferUnwatched && !this.preferAuthor) {
+                this.nextVideo = this.video.relatedStreams[0];
+                return;
+            }
+            if (!this.preferUnwatched) {
+                this.nextVideo = this.video.relatedStreams.find(video => video.uploaderUrl === this.video.uploaderUrl);
+                if (!this.nextVideo) this.nextVideo = this.video.relatedStreams[0];
+                return;
+            }
+            for (let i = 0; i < this.video.relatedStreams.length; i++) {
+                let foundAuthorMatch = false;
+                const video = this.video.relatedStreams[i];
+                if (!video.watched) {
+                    if (!this.preferAuthor) {
+                        this.nextVideo = video;
+                        break;
+                    }
+                    if (video.uploaderUrl === this.video.uploaderUrl) {
+                        this.nextVideo = video;
+                        foundAuthorMatch = true;
+                        break;
+                    } else if (!foundAuthorMatch) {
+                        this.nextVideo = video;
+                    }
+                }
+                if (!this.nextVideo) {
+                    this.nextVideo = this.video.relatedStreams[0];
+                }
+            }
+        },
     },
 };
 </script>
diff --git a/src/locales/en.json b/src/locales/en.json
index 6ddfab971f..1a0daeb466 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -49,6 +49,8 @@
         "dark": "Dark",
         "light": "Light",
         "autoplay_video": "Autoplay Video",
+        "autoplay_prefer_unwatched": "Prefer unwatched videos",
+        "autoplay_prefer_same_author": "Prefer videos from the same author",
         "audio_only": "Audio Only",
         "default_quality": "Default Quality",
         "buffering_goal": "Buffering Goal (in seconds)",
@@ -158,7 +160,8 @@
         "live": "{0} Live",
         "shorts": "Shorts",
         "all": "All",
-        "category": "Category"
+        "category": "Category",
+        "next_up": "Next up:"
     },
     "search": {
         "did_you_mean": "Did you mean: {0}?",
diff --git a/src/main.js b/src/main.js
index 341a24c8c8..aa0ed100a0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -208,15 +208,24 @@ const mixin = {
             if (window.db && this.getPreferenceBoolean("watchHistory", false)) {
                 var tx = window.db.transaction("watch_history", "readonly");
                 var store = tx.objectStore("watch_history");
-                videos.map(async video => {
-                    var request = store.get(video.url.substr(-11));
-                    request.onsuccess = function (event) {
-                        if (event.target.result) {
-                            video.watched = true;
-                            video.currentTime = event.target.result.currentTime;
-                        }
-                    };
-                });
+                return Promise.all(
+                    videos.map(
+                        video =>
+                            new Promise(resolve => {
+                                var request = store.get(video.url.substr(-11));
+                                request.onsuccess = function (event) {
+                                    if (event.target.result) {
+                                        video.watched = true;
+                                        video.currentTime = event.target.result.currentTime;
+                                    }
+                                    resolve();
+                                };
+                                request.onerror = function () {
+                                    resolve();
+                                };
+                            }),
+                    ),
+                );
             }
         },
         getLocalSubscriptions() {