diff --git a/app/models.py b/app/models.py
index 3bfac663..2fe5dd1b 100644
--- a/app/models.py
+++ b/app/models.py
@@ -83,8 +83,9 @@ class Track:
         self.image = self.albumhash + ".webp"
 
         if self.genre is not None:
-            self.genre = str(self.genre).replace("/", ", ")
-            self.genre = str(self.genre).lower().split(", ")
+            self.genre = str(self.genre).replace("/", ",").replace(";", ",")
+            self.genre = str(self.genre).lower().split(",")
+            self.genre = [g.strip() for g in self.genre]
 
 
 @dataclass