diff --git a/src/playqueue.hpp b/src/playqueue.hpp
index 8727778..bbf521f 100644
--- a/src/playqueue.hpp
+++ b/src/playqueue.hpp
@@ -124,14 +124,17 @@ public:
         return static_cast<qint64>(current()["id"].toDouble());
     }
 
-    /// Advance and return the new current track.  Returns {} at end of queue.
+    /// Advance and return the track to play next.  Returns {} at end of queue.
     QJsonObject advance()
     {
         if (!m_playNext.isEmpty()) {
-            m_playNext.removeFirst();
-        } else {
-            ++m_index;
+            // Return the playNext item directly — do NOT call current() after
+            // removal, as that would fall back to the already-playing m_index track.
+            const QJsonObject next = m_playNext.takeFirst();
+            emit queueChanged();
+            return next;
         }
+        ++m_index;
         emit queueChanged();
         return current();
     }