diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt
index 6aea0189..cb7261e5 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt
@@ -251,12 +251,13 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         }
 
         //TODO: Is this still necessary?
-        fragment.lifecycleScope.launch(Dispatchers.Main) {
-            try {
-                if(viewHolder.childViewHolder is ContentPreviewViewHolder)
+        if(viewHolder.childViewHolder is ContentPreviewViewHolder) {
+            fragment.lifecycleScope.launch(Dispatchers.Main) {
+                try {
                     (recyclerData.adapter as PreviewContentListAdapter?)?.preview(viewHolder.childViewHolder)
-            } catch (e: Throwable) {
-                Logger.e(TAG, "playPreview failed", e)
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "playPreview failed", e)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 06de4362..0d75e6a0 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -2563,12 +2563,10 @@ class VideoDetailView : ConstraintLayout {
                 if (d != null && d.connectionState == CastConnectionState.CONNECTED)
                     castIfAvailable(context.contentResolver, video, _lastVideoSource, _lastAudioSource, toSet, (d.expectedCurrentTime * 1000.0).toLong(), d.speed);
                 else {
-                    withContext(Dispatchers.Main) {
-                        _player.swapSubtitles(toSet);
-                    }
+                    _player.swapSubtitles(toSet);
                 }
             } catch (e: Throwable) {
-                Logger.e(TAG, "handleSelectAudioTrack failed", e)
+                Logger.e(TAG, "handleSelectSubtitleTrack failed", e)
             }
         }
         _lastSubtitleSource = toSet;