diff --git a/src/musikbox/app/service/PlaybackService.cpp b/src/musikbox/app/service/PlaybackService.cpp
index eaad4b241..725ab9e49 100755
--- a/src/musikbox/app/service/PlaybackService.cpp
+++ b/src/musikbox/app/service/PlaybackService.cpp
@@ -141,6 +141,9 @@ void PlaybackService::ToggleShuffle() {
         id = this->playlist.GetId(this->index);
     }
 
+    this->playlist.ClearCache();
+    this->unshuffled.ClearCache();
+
     if (this->unshuffled.Count() > 0) { /* shuffled -> unshuffled */
         this->playlist.Clear();
         this->playlist.Swap(this->unshuffled);