diff --git a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs
index 9cf14cf..2c426a8 100644
--- a/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs
+++ b/Jellyfin.Plugin.JavTube/Providers/MovieProvider.cs
@@ -65,7 +65,6 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider<Movie, MovieI
                 OriginalTitle = originalTitle,
                 Overview = m.Summary,
                 Tagline = m.Series,
-                Genres = m.Tags,
                 OfficialRating = Rating,
                 PremiereDate = m.ReleaseDate.TryGetValidDateTime(),
                 ProductionYear = m.ReleaseDate.TryGetValidDateTime()?.Year,
@@ -82,6 +81,10 @@ public class MovieProvider : BaseProvider, IRemoteMetadataProvider<Movie, MovieI
             Position = pid.Position
         });
 
+        // Set Genres.
+        if (m.Tags?.Length > 0)
+            result.Item.SetGenres(m.Tags);
+
         // Add Studios.
         if (!string.IsNullOrWhiteSpace(m.Maker))
             result.Item.AddStudio(m.Maker);