diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index 090c0bb5a..cf8d9694d 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -242,6 +242,8 @@ void PlaylistManager::SongsDiscovered(const SongList& songs) {
     foreach (const Data& data, playlists_) {
       PlaylistItemList items = data.p->library_items_by_id(song.id());
       foreach (boost::shared_ptr<PlaylistItem> item, items) {
+        if (item->Metadata().directory_id() != song.directory_id())
+          continue;
         static_cast<LibraryPlaylistItem*>(item.get())->SetMetadata(song);
       }
     }