diff --git a/src/player.c b/src/player.c
index 54c631df..049afcc4 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1666,6 +1666,8 @@ pb_session_pause(void)
 {
   pb_timer_stop();
 
+  seek_save();
+
   source_stop();
 }
 
@@ -1675,6 +1677,8 @@ pb_session_stop(void)
 {
   pb_timer_stop();
 
+  seek_save();
+
   source_stop();
 
   session_stop();
@@ -2347,8 +2351,6 @@ playback_pause_bh(void *arg, int *retval)
 
   status_update(PLAY_PAUSED);
 
-  seek_save();
-
   *retval = 0;
   return COMMAND_END;