diff --git a/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt
index 5faccc17..ea310499 100644
--- a/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt
@@ -127,6 +127,7 @@ class PlayerSettingsActivity : AppCompatActivity() {
         binding.playerSettingsTimeStamps.isChecked = PrefManager.getVal(PrefName.TimeStampsEnabled)
         binding.playerSettingsTimeStamps.setOnCheckedChangeListener { _, isChecked ->
             PrefManager.setVal(PrefName.TimeStampsEnabled, isChecked)
+            binding.playerSettingsAutoSkipOpEd.isEnabled = isChecked
         }
 
         binding.playerSettingsTimeStampsAutoHide.isChecked = PrefManager.getVal(PrefName.AutoHideTimeStamps)
@@ -148,6 +149,7 @@ class PlayerSettingsActivity : AppCompatActivity() {
 
         // Auto
         binding.playerSettingsAutoSkipOpEd.isChecked = PrefManager.getVal(PrefName.AutoSkipOPED)
+        binding.playerSettingsAutoSkipOpEd.isEnabled = binding.playerSettingsTimeStamps.isChecked
         binding.playerSettingsAutoSkipOpEd.setOnCheckedChangeListener { _, isChecked ->
             PrefManager.setVal(PrefName.AutoSkipOPED, isChecked)
         }
@@ -172,7 +174,7 @@ class PlayerSettingsActivity : AppCompatActivity() {
         binding.playerSettingsAskChapterZero.isChecked =
             PrefManager.getVal(PrefName.ChapterZeroPlayer)
         binding.playerSettingsAskChapterZero.isEnabled =
-            !PrefManager.getVal<Boolean>(PrefName.AskIndividualPlayer)
+            !binding.playerSettingsAskUpdateProgress.isChecked
         binding.playerSettingsAskChapterZero.setOnCheckedChangeListener { _, isChecked ->
             PrefManager.setVal(PrefName.ChapterZeroPlayer, isChecked)
         }