diff --git a/core/AmPlaylist.cpp b/core/AmPlaylist.cpp
index 89c5e7f0..c0a6f55c 100644
--- a/core/AmPlaylist.cpp
+++ b/core/AmPlaylist.cpp
@@ -145,6 +145,11 @@ void AmPlaylist::addToPlayListFront(AmPlaylistItem* item)
 void AmPlaylist::close(bool notify)
 {
   cur_mut.lock();
+  if(!cur_item && !items.empty()){
+    cur_item = items.front();
+    items.pop_front();
+  }
+
   while(cur_item)
     gotoNextItem(notify);
   cur_mut.unlock();