diff --git a/backend/src/song.py b/backend/src/song.py
index b492a44..7409d06 100644
--- a/backend/src/song.py
+++ b/backend/src/song.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-import uuid
 from sqlite3 import Cursor
 
 from .connect import get_connection
@@ -38,7 +37,7 @@ def get_song_by_uuid(uuid: str) -> Song | None:
     if row is None:
         return None
 
-    song = Song(uuid=row["uuid"], title=row["title"], artist=row["artist"], tags=row["tags"].split(","), image_id=row["lastfm_image_id"], youtube_id=row["youtube_id"])
+    song = Song(uuid=row["uuid"], title=row["title"], artist=row["artist"], tags=list(filter(None, row["tags"].split(","))), image_id=row["lastfm_image_id"], youtube_id=row["youtube_id"])
     return song
 
 
@@ -52,7 +51,7 @@ def get_song_by_title_artist(title: str, artist: str) -> Song | None:
     if row is None:
         return None
 
-    song = Song(uuid=row["uuid"], title=row["title"], artist=row["artist"], tags=row["tags"].split(","), image_id=row["lastfm_image_id"], youtube_id=row["youtube_id"])
+    song = Song(uuid=row["uuid"], title=row["title"], artist=row["artist"], tags=list(filter(None, row["tags"].split(","))), image_id=row["lastfm_image_id"], youtube_id=row["youtube_id"])
     return song