--- a/src/ohplaylist.cxx
+++ b/src/ohplaylist.cxx
@@ -278,7 +278,8 @@
         refreshState();
         maybeWakeUp(true);
     } else {
-        m_dev->m_mpdcli->saveState(m_mpdsavedstate, 0);
+        m_dev->m_mpdcli->saveState(m_mpdsavedstate);
+        iStop();
     }
 }