diff --git a/apps/playback.c b/apps/playback.c
index 87773f8..9f6feb2 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -638,9 +638,6 @@ void audio_next(void)
 
         LOGFQUEUE("audio > audio Q_AUDIO_SKIP 1");
         queue_post(&audio_queue, Q_AUDIO_SKIP, 1);
-        /* Update wps while our message travels inside deep playback queues. */
-        wps_offset++;
-        track_changed = true;
     }
     else
     {
@@ -659,9 +656,6 @@ void audio_prev(void)
 
         LOGFQUEUE("audio > audio Q_AUDIO_SKIP -1");
         queue_post(&audio_queue, Q_AUDIO_SKIP, -1);
-        /* Update wps while our message travels inside deep playback queues. */
-        wps_offset--;
-        track_changed = true;
     }
     else
     {
@@ -2294,15 +2288,19 @@ static void audio_new_playlist(void)
     audio_fill_file_buffer(false, 0);
 }
 
+/* Called on manual track skip */
 static void audio_initiate_track_change(long direction)
 {
+    logf("audio_initiate_track_change(%ld)", direction);
+
     playlist_end = false;
     ci.new_track += direction;
-    wps_offset -= direction;
+    track_changed = true;
     if (paused)
         skipped_during_pause = true;
 }
 
+/* Called on manual dir skip */
 static void audio_initiate_dir_change(long direction)
 {
     playlist_end = false;