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 eea04534a..45d0f2c73 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
@@ -1495,15 +1495,12 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
         val orientation = resources.configuration.orientation
         if (commonPlayerViewModel.isFullscreen.value != true && orientation != playerLayoutOrientation) {
             // remember the current position before recreating the activity
-            arguments?.putLong(
-                IntentData.timeStamp,
-                playerController.currentPosition / 1000
-            )
             playerLayoutOrientation = orientation
 
             viewModel.isOrientationChangeInProgress = true
 
-            playerController.release()
+            if (::playerController.isInitialized) playerController.release()
+
             activity?.recreate()
         }
     }