diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index b3369fec9..7549c82c5 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -455,7 +455,10 @@ class PlayerFragment : Fragment() {
                     if (!relatedStreamsEnabled) toggleComments()
                     // prepare for autoplay
                     initAutoPlay()
-                    PreferenceHelper.addToWatchHistory(requireContext(), videoId!!, response)
+                    val watchHistoryEnabled =
+                        PreferenceHelper.getBoolean(requireContext(), "Watch_history_toggle", true)
+                    if (watchHistoryEnabled)
+                        PreferenceHelper.addToWatchHistory(requireContext(), videoId!!, response)
                 }
             }
         }
diff --git a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
index 3fb39c7e8..91a38d072 100644
--- a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
@@ -18,12 +18,20 @@ class AdvancedSettings : PreferenceFragmentCompat() {
         val settingsActivity = activity as SettingsActivity
         settingsActivity.binding.topBarTextView.text = getString(R.string.advanced)
 
+        // clear search history
         val clearHistory = findPreference<Preference>("clear_history")
         clearHistory?.setOnPreferenceClickListener {
             PreferenceHelper.removePreference(requireContext(), "search_history")
             true
         }
 
+        // clear watch history
+        val clearWatchHistory = findPreference<Preference>("clear_watch_history")
+        clearWatchHistory?.setOnPreferenceClickListener {
+            PreferenceHelper.removePreference(requireContext(), "watch_history")
+            true
+        }
+
         val resetSettings = findPreference<Preference>("reset_settings")
         resetSettings?.setOnPreferenceClickListener {
             showResetDialog()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3abd7ec36..483374be3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <string name="okay">OK</string>
     <string name="history">History</string>
     <string name="search_history">Search History</string>
-    <string name="clear_history">Clear History</string>
+    <string name="clear_history">Clear search history</string>
     <string name="music_songs">YT Music Songs</string>
     <string name="music_videos">YT Music Videos</string>
     <string name="music_albums">YT Music Albums</string>
@@ -207,4 +207,5 @@
     <string name="deleteAccount_summary">Delete your Piped account</string>
     <string name="account">Account</string>
     <string name="restore">Restore</string>
+    <string name="watch_history">Watch history</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index a9e92a024..ad17cd058 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -46,6 +46,21 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory app:title="@string/watch_history">
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_history_filled"
+            app:key="watch_history_toggle"
+            app:title="@string/watch_history" />
+
+        <Preference
+            android:icon="@drawable/ic_trash"
+            app:key="clear_watch_history"
+            app:title="@string/clear_history" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory>
 
         <Preference