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 c7aca8244..d3e099a61 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -399,7 +399,7 @@ class PlayerFragment : BaseFragment() {
         }
     }
 
-    private val playerViewInterface = object : OnlinePlayerOptionsInterface {
+    private val onlinePlayerOptionsInterface = object : OnlinePlayerOptionsInterface {
         override fun onCaptionClicked() {
             if (!this@PlayerFragment::streams.isInitialized ||
                 streams.subtitles == null ||
@@ -883,7 +883,7 @@ class PlayerFragment : BaseFragment() {
         // initialize the player view actions
         binding.player.initialize(
             childFragmentManager,
-            playerViewInterface,
+            onlinePlayerOptionsInterface,
             doubleTapOverlayBinding,
             trackSelector
         )
diff --git a/app/src/main/java/com/github/libretube/interfaces/PlayerOptionsInterface.kt b/app/src/main/java/com/github/libretube/interfaces/PlayerOptionsInterface.kt
index 656d38da2..4553aadc4 100644
--- a/app/src/main/java/com/github/libretube/interfaces/PlayerOptionsInterface.kt
+++ b/app/src/main/java/com/github/libretube/interfaces/PlayerOptionsInterface.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.interfaces
 
 interface PlayerOptionsInterface {
-
     fun onAutoplayClicked()
 
     fun onPlaybackSpeedClicked()
diff --git a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
index f9e8ce7d5..2e9f0a7f6 100644
--- a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
@@ -42,7 +42,7 @@ internal class CustomExoPlayerView(
     private var doubleTapListener: DoubleTapInterface? = null
     private var onlinePlayerOptionsInterface: OnlinePlayerOptionsInterface? = null
     private lateinit var childFragmentManager: FragmentManager
-    private lateinit var trackSelector: TrackSelector
+    private var trackSelector: TrackSelector? = null
 
     private val runnableHandler = Handler(Looper.getMainLooper())
 
@@ -154,8 +154,8 @@ internal class CustomExoPlayerView(
                 }
                 // set the current caption language
                 currentCaptions =
-                    if (trackSelector.parameters.preferredTextLanguages.isNotEmpty()) {
-                        trackSelector.parameters.preferredTextLanguages[0]
+                    if (trackSelector != null && trackSelector!!.parameters.preferredTextLanguages.isNotEmpty()) {
+                        trackSelector!!.parameters.preferredTextLanguages[0]
                     } else {
                         context?.getString(R.string.none)
                     }