diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index d0c398bc..6045cb2c 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
@@ -138,7 +138,15 @@ class PlayerActivity : BasePlayerActivity() {
 
                             // Skip Intro button
                             skipIntroButton.isVisible = !isInPictureInPictureMode && (currentIntro != null || currentCredit != null)
-                            skipIntroButton.text = if (currentCredit != null) getString(CoreR.string.skip_credit_button) else getString(CoreR.string.skip_intro_button)
+                            skipIntroButton.text = if (currentCredit != null) {
+                                if (binding.playerView.player?.hasNextMediaItem() == true) {
+                                    getString(CoreR.string.skip_credit_button)
+                                } else {
+                                    getString(CoreR.string.skip_credit_button_last)
+                                }
+                            } else {
+                                getString(CoreR.string.skip_intro_button)
+                            }
                             skipIntroButton.setOnClickListener {
                                 if (currentIntro != null) {
                                     currentIntro?.let {
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 28fff6fd..f374fad4 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -187,4 +187,5 @@
     <string name="remove_from_favorites">Rimuovi dai preferiti</string>
     <string name="skip_intro_button">Salta intro</string>
     <string name="skip_credit_button">Prossimo episodio</string>
+    <string name="skip_credit_button_last">Chiudi player</string>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index c7224682..19e2df36 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -187,4 +187,5 @@
     <string name="remove_from_favorites">Remove from favorites</string>
     <string name="skip_intro_button">Skip Intro</string>
     <string name="skip_credit_button">Next episode</string>
+    <string name="skip_credit_button_last">Close player</string>
 </resources>