diff --git a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
index f1954abd..a4bf04d4 100644
--- a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
+++ b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
@@ -118,10 +118,11 @@ export const useHandlePlayQueueAdd = () => {
 
         songs = songList?.items?.map((song: Song) => ({ ...song, uniqueId: nanoid() })) || null;
       } else if (byData) {
-        songs = byData.map((song) => ({ ...song, uniqueId: nanoid() }));
+        songs = byData.map((song) => ({ ...song, uniqueId: nanoid() })) || null;
       }
 
-      if (!songs) return toast.warn({ message: 'No songs found' });
+      if (!songs || songs?.length === 0)
+        return toast.warn({ message: 'The query returned no results', title: 'No tracks added' });
 
       if (initialIndex) {
         initialSongIndex = initialIndex;