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 b354bc2bc..2bee35ca3 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -53,6 +53,7 @@ import com.github.libretube.obj.Segment
 import com.github.libretube.obj.Segments
 import com.github.libretube.obj.Streams
 import com.github.libretube.obj.Subscribe
+import com.github.libretube.obj.StreamItem
 import com.github.libretube.preferences.SponsorBlockSettings
 import com.github.libretube.util.CronetHelper
 import com.github.libretube.util.DescriptionAdapter
@@ -101,6 +102,8 @@ class PlayerFragment : Fragment() {
     private var eId: Int = 0
     private var paused = false
     private var whichQuality = 0
+    private var transitioning = false
+    private var autoplay = false
     private var isZoomed: Boolean = false
 
     private var isSubscribed: Boolean = false
@@ -115,6 +118,7 @@ class PlayerFragment : Fragment() {
     private lateinit var motionLayout: MotionLayout
     private lateinit var exoPlayer: ExoPlayer
     private lateinit var segmentData: Segments
+    private var relatedStreams: List<StreamItem>? = arrayListOf()
     private var relatedStreamsEnabled = true
 
     private lateinit var relDownloadVideo: LinearLayout
@@ -386,10 +390,13 @@ class PlayerFragment : Fragment() {
                 uploader = response.uploader!!
                 thumbnailUrl = response.thumbnailUrl!!
 
-                // check whether related streams are enabled
+                // check whether related streams and autoplay are enabled
                 val sharedPreferences = PreferenceManager
                     .getDefaultSharedPreferences(requireContext())
+                autoplay = sharedPreferences.getBoolean("autoplay", false)
                 relatedStreamsEnabled = sharedPreferences.getBoolean("related_streams_toggle", true)
+                // save related streams for autoplay
+                relatedStreams = response.relatedStreams
                 runOnUiThread {
                     createExoPlayer(view)
                     prepareExoPlayerView()
@@ -515,8 +522,22 @@ class PlayerFragment : Fragment() {
                         !playWhenReady
                     )
 
+                // check if video has ended, next video is available and autoplay is enabled.
+                if (
+                    playbackState == Player.STATE_ENDED &&
+                    relatedStreams != null &&
+                    relatedStreams!!.isNotEmpty() &&
+                    !transitioning &&
+                    autoplay
+                ) {
+                    transitioning = true
+                    videoId = relatedStreams!![0].url!!.replace("/watch?v=", "")
+                    fetchJsonAndInitPlayer(view)
+                }
+
                 if (playWhenReady && playbackState == Player.STATE_READY) {
                     // media actually playing
+                    transitioning = false
                     view.findViewById<ImageView>(R.id.play_imageView)
                         .setImageResource(R.drawable.ic_pause)
                 } else if (playWhenReady) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d0b43c9ff..b30c71c70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,4 +189,5 @@
     <string name="audio">Audio</string>
     <string name="video">Video</string>
     <string name="downloading">Downloading</string>
+    <string name="player_autoplay">Autoplay</string>
 </resources>
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index a82c50bba..afda1a47e 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -40,6 +40,13 @@
             app:summary="@string/buffering_goal_summary"
             app:title="@string/buffering_goal" />
 
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_play"
+            app:key="autoplay"
+            app:title="@string/player_autoplay"
+            android:summaryOff="@string/disabled"
+            android:summaryOn="@string/enabled" />
+
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/downloads">
diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt
new file mode 100644
index 000000000..71961f09c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/12.txt
@@ -0,0 +1,9 @@
+Subscribed Channels Rework
+Update Checker
+About Section in Settings
+Live videos fix and indication
+Comment replies
+Search suggestions rewrite
+Custom instance option
+Video chapters support
+Player notification thumbnail and description