diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreenRuntimeEffects.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreenRuntimeEffects.kt
index cad98ac8d..0b18abe84 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreenRuntimeEffects.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreenRuntimeEffects.kt
@@ -23,12 +23,12 @@ import kotlinx.coroutines.launch
 import nuvio.composeapp.generated.resources.*
 import org.jetbrains.compose.resources.getString
 
-/** Whether auto-skip is enabled for this segment's type. */
+/** Whether auto-skip is enabled for this segment's type (categorized by SkipIntroRepository). */
 internal fun PlayerSettingsUiState.autoSkips(interval: SkipInterval): Boolean =
-    when (interval.type.lowercase()) {
-        "intro", "op", "mixed-op" -> autoSkipIntroEnabled
+    when (SkipIntroRepository.segmentCategory(interval.type)) {
+        "opening" -> autoSkipIntroEnabled
         "recap" -> autoSkipRecapEnabled
-        "outro", "ed", "mixed-ed", "credits" -> autoSkipOutroEnabled
+        "ending" -> autoSkipOutroEnabled
         else -> false
     }
 
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/skip/SkipIntroRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/skip/SkipIntroRepository.kt
index d99dc9785..7063b3fb4 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/skip/SkipIntroRepository.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/skip/SkipIntroRepository.kt
@@ -151,7 +151,7 @@ object SkipIntroRepository {
         return chosen.values.toList()
     }
 
-    private fun segmentCategory(type: String): String? = when (type.lowercase()) {
+    internal fun segmentCategory(type: String): String? = when (type.lowercase()) {
         "intro", "op", "mixed-op" -> "opening"
         "outro", "ed", "mixed-ed", "credits", "ending" -> "ending"
         "recap" -> "recap"