diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 5c33e325f1..45842ec7b4 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1760,8 +1760,10 @@
 ``--save-position-on-quit``
     Always save the current playback position on quit. When this file is
     played again later, the player will seek to the old playback position on
-    start. This affects any form of stopping playback (quitting, going to the
-    next file).
+    start. This does not happen if playback of a file is stopped in any other
+    way than quitting. For example, going to the next file in the playlist
+    will not save the position, and start playback at beginning the next time
+    the file is played.
 
     This behavior is disabled by default, but is always available when quitting
     the player with Shift+Q.
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index a0965f46bf..ac4642ab57 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -4470,8 +4470,7 @@ goto_reopen_demuxer: ;
 
 terminate_playback:  // don't jump here after ao/vo/getch initialization!
 
-    if (opts->position_save_on_quit && mpctx->stop_play != PT_RESTART &&
-        mpctx->stop_play != AT_END_OF_FILE)
+    if (opts->position_save_on_quit && mpctx->stop_play == PT_QUIT)
         mp_write_watch_later_conf(mpctx);
 
     if (mpctx->step_frames)