diff --git a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt
index 9865320b..9597be9f 100644
--- a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt
@@ -468,6 +468,8 @@ class MainActivity : SimpleMusicActivity() {
                 }
             } else if (it > 0) {
                 pickedSleepTimer(it)
+            } else if (config.lastSleepTimerSeconds > 0) {
+                sleepTimerChanged(Events.SleepTimerChanged(seconds = it))
             }
         }
     }
@@ -500,10 +502,10 @@ class MainActivity : SimpleMusicActivity() {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun sleepTimerChanged(event: Events.SleepTimerChanged) {
-        binding.sleepTimerValue.text = event.seconds.getFormattedDuration()
-        binding.sleepTimerHolder.beVisible()
-
-        if (event.seconds == 0) {
+        if (event.seconds > 0) {
+            binding.sleepTimerValue.text = event.seconds.getFormattedDuration()
+            binding.sleepTimerHolder.beVisible()
+        } else {
             finish()
         }
     }