diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index a4c970a4c..a3d62ef3b 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -577,6 +577,9 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
 
     override fun onDestroy() {
         super.onDestroy()
+
+        handler.removeCallbacksAndMessages(null)
+
         try {
             // disable the auto PiP mode for SDK >= 32
             disableAutoPiP()
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
index a1e2d6007..94b8959f0 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
@@ -19,8 +19,8 @@ open class ExpandedBottomSheet : BottomSheetDialogFragment() {
 
         dialog.setOnShowListener {
             (it as BottomSheetDialog).let { d ->
-                (d.findViewById<View>(R.id.design_bottom_sheet) as FrameLayout?)?.let {
-                    BottomSheetBehavior.from(it).state =
+                (d.findViewById<View>(R.id.design_bottom_sheet) as FrameLayout?)?.let { fl ->
+                    BottomSheetBehavior.from(fl).state =
                         BottomSheetBehavior.STATE_EXPANDED
                 }
             }