diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index e20a07fa..fd29d998 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -238,6 +238,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
                 meta.name = newMeta.headerName
             }
+
             is ExtractorUri -> {
                 if (newMeta.tvType?.isMovieType() == false) {
                     meta.episode = newMeta.episode
@@ -980,6 +981,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 is ResultEpisode -> {
                     DataStoreHelper.removeLastWatched(newMeta.parentId)
                 }
+
                 is ExtractorUri -> {
                     DataStoreHelper.removeLastWatched(newMeta.parentId)
                 }
@@ -996,6 +998,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         isFromDownload = false
                     )
                 }
+
                 is ExtractorUri -> {
                     DataStoreHelper.setLastWatched(
                         resumeMeta.parentId,
@@ -1127,6 +1130,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 season = meta.season
                 tvType = meta.tvType
             }
+
             is ExtractorUri -> {
                 headerName = meta.headerName
                 subName = meta.name
@@ -1343,6 +1347,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 is Resource.Loading -> {
                     startLoading()
                 }
+
                 is Resource.Success -> {
                     // provider returned false
                     //if (it.value != true) {
@@ -1350,6 +1355,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     //}
                     startPlayer()
                 }
+
                 is Resource.Failure -> {
                     showToast(activity, it.errorString, Toast.LENGTH_LONG)
                     startPlayer()
@@ -1364,10 +1370,12 @@ class GeneratorPlayer : FullScreenPlayer() {
             overlay_loading_skip_button?.isVisible = turnVisible
 
             normalSafeApiCall {
-                currentLinks.lastOrNull()?.let { last ->
-                    if (getLinkPriority(currentQualityProfile, last) >= QualityDataHelper.AUTO_SKIP_PRIORITY) {
-                        startPlayer()
+                if (currentLinks.any { link ->
+                        getLinkPriority(currentQualityProfile, link) >=
+                                QualityDataHelper.AUTO_SKIP_PRIORITY
                     }
+                ) {
+                    startPlayer()
                 }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 7faf0cf5..13171d40 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -156,18 +156,19 @@ class PlayerGeneratorViewModel : ViewModel() {
             val currentSubs = mutableSetOf<SubtitleData>()
 
             // clear old data
-            _currentSubs.postValue(currentSubs)
-            _currentLinks.postValue(currentLinks)
+            _currentSubs.postValue(emptySet())
+            _currentLinks.postValue(emptySet())
 
             // load more data
             _loadingLinks.postValue(Resource.Loading())
             val loadingState = safeApiCall {
                 generator?.generateLinks(clearCache = clearCache, isCasting = isCasting, {
                     currentLinks.add(it)
-                    _currentLinks.postValue(currentLinks)
+                    // Clone to prevent ConcurrentModificationException
+                    _currentLinks.postValue(currentLinks.toSet())
                 }, {
                     currentSubs.add(it)
-                    // _currentSubs.postValue(currentSubs) // this causes ConcurrentModificationException, so fuck it
+                    _currentSubs.postValue(currentSubs.toSet())
                 })
             }