diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue
index bb8ac13d..35c0888d 100644
--- a/src/components/FeedPage.vue
+++ b/src/components/FeedPage.vue
@@ -48,7 +48,7 @@
 
     <LoadingIndicatorPage :show-content="videosStore != null" class="video-grid">
         <template v-for="video in filteredVideos" :key="video.url">
-            <VideoItem v-if="shouldShowVideo(video)" :is-feed="true" :item="video" />
+            <VideoItem v-if="shouldShowVideo(video)" :is-feed="true" :item="video" @update:watched="onUpdateWatched" />
         </template>
     </LoadingIndicatorPage>
 </template>
@@ -140,6 +140,15 @@ export default {
                 this.loadMoreVideos();
             }
         },
+        onUpdateWatched(urls = null) {
+            if (urls === null) {
+                if (this.videos.length > 0) this.updateWatched(this.videos);
+                return;
+            }
+
+            const subset = this.videos.filter(({ url }) => urls.includes(url));
+            if (subset.length > 0) this.updateWatched(subset);
+        },
         shouldShowVideo(video) {
             switch (this.selectedFilter.toLowerCase()) {
                 case "shorts":
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index e44c5e06..49f73d80 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -127,6 +127,18 @@
                 >
                     <i class="i-fa6-solid:circle-minus" />
                 </button>
+                <button
+                    v-if="showMarkOnWatched && isFeed"
+                    ref="watchButton"
+                    @click="toggleWatched(item.url.substr(-11))"
+                >
+                    <i
+                        v-if="item.watched && item.currentTime > item.duration * 0.9"
+                        :title="$t('actions.mark_as_unwatched')"
+                        class="i-fa6-solid:eye-slash"
+                    />
+                    <i v-else :title="$t('actions.mark_as_watched')" class="i-fa6-solid:eye" />
+                </button>
                 <ConfirmModal
                     v-if="showConfirmRemove"
                     :message="$t('actions.delete_playlist_video_confirm')"
@@ -176,13 +188,14 @@ export default {
         preferListen: { type: Boolean, default: false },
         admin: { type: Boolean, default: false },
     },
-    emits: ["remove"],
+    emits: ["update:watched", "remove"],
     data() {
         return {
             showPlaylistModal: false,
             showShareModal: false,
             showVideo: true,
             showConfirmRemove: false,
+            showMarkOnWatched: false,
         };
     },
     computed: {
@@ -195,6 +208,7 @@ export default {
     },
     mounted() {
         this.shouldShowVideo();
+        this.shouldShowMarkOnWatched();
     },
     methods: {
         removeVideo() {
@@ -217,6 +231,38 @@ export default {
                 }
             };
         },
+        shouldShowMarkOnWatched() {
+            this.showMarkOnWatched = this.getPreferenceBoolean("watchHistory", false);
+        },
+        toggleWatched(videoId) {
+            if (window.db) {
+                var tx = window.db.transaction("watch_history", "readwrite");
+                var store = tx.objectStore("watch_history");
+                var instance = this;
+                var request = store.get(videoId);
+                request.onsuccess = function (event) {
+                    var video = event.target.result;
+                    if (video) {
+                        video.watchedAt = Date.now();
+                    } else {
+                        video = {
+                            videoId: videoId,
+                            title: instance.item.title,
+                            duration: instance.item.duration,
+                            thumbnail: instance.item.thumbnail,
+                            uploaderUrl: instance.item.uploaderUrl,
+                            uploaderName: instance.item.uploaderName,
+                            watchedAt: Date.now(),
+                        };
+                    }
+                    video.currentTime =
+                        instance.item.currentTime < instance.item.duration * 0.9 ? instance.item.duration : 0;
+                    store.put(video);
+                    instance.$emit("update:watched", [instance.item.url]);
+                    instance.shouldShowVideo();
+                };
+            }
+        },
     },
 };
 </script>
diff --git a/src/locales/en.json b/src/locales/en.json
index b296c2c5..9c9d505a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -132,6 +132,8 @@
         "show_chapters": "Chapters",
         "store_search_history": "Store Search History",
         "hide_watched": "Hide watched videos in the feed",
+        "mark_as_watched": "Mark as Watched",
+        "mark_as_unwatched": "Mark as Unwatched",
         "documentation": "Documentation",
         "status_page": "Status",
         "source_code": "Source code",
diff --git a/src/main.js b/src/main.js
index b7d5b187..eff06f92 100644
--- a/src/main.js
+++ b/src/main.js
@@ -144,7 +144,7 @@ const mixin = {
                     var request = store.get(video.url.substr(-11));
                     request.onsuccess = function (event) {
                         if (event.target.result) {
-                            video.watched = true;
+                            video.watched = event.target.result.currentTime != 0;
                             video.currentTime = event.target.result.currentTime;
                         }
                     };