diff --git a/app/lib/folderslib.py b/app/lib/folderslib.py
index 7ff5205a..ff8bb9c2 100644
--- a/app/lib/folderslib.py
+++ b/app/lib/folderslib.py
@@ -8,7 +8,7 @@ from app.settings import SUPPORTED_FILES
 from app.store.folder import FolderStore
 from app.utils.wintools import win_replace_slash
 
-from app.db.libdata import TrackTable as TrackDB
+# from app.db.libdata import TrackTable as TrackDB
 
 
 def create_folder(path: str, trackcount=0, foldercount=0) -> Folder:
diff --git a/app/store/folder.py b/app/store/folder.py
index 10fd60fe..34555ccb 100644
--- a/app/store/folder.py
+++ b/app/store/folder.py
@@ -42,7 +42,7 @@ class FolderStore:
                 track = TrackStore.trackhashmap.get(trackhash)
 
                 if track:
-                    yield [t for t in track.tracks if t.filepath == filepath][0]
+                    yield track.tracks[0]
 
     @classmethod
     def count_tracks_containing_paths(cls, paths: list[str]):