diff --git a/app/playlists.py b/app/playlists.py
index 982f8c1..4d5c2ac 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -876,7 +876,10 @@ class Playlist(QTableWidget):
             playlist_tracks[row] = self._get_row_id(row)
 
         # Database
-        for track in self.db.tracks:
+        # Workaround for issue #10
+        # for track in self.db.tracks:
+        for track in session.query(PlaylistTracks).filter(
+                PlaylistTracks.playlist_id == self.db.id).all():
             database_tracks[track.row] = track.track_id
 
         # Tracks rows to add to database