diff --git a/pmocontrol/src/control_point.rs b/pmocontrol/src/control_point.rs
index 6f6ddb43..768f7cc1 100644
--- a/pmocontrol/src/control_point.rs
+++ b/pmocontrol/src/control_point.rs
@@ -542,6 +542,9 @@ impl ControlPoint {
                             "Sleep timer expired, stopping playback"
                         );
 
+                        // Mark this as a user-requested stop to prevent auto-advance
+                        renderer.mark_user_stop_requested();
+
                         // Stop playback
                         if let Err(err) = renderer.stop() {
                             warn!(