diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 713964ee23..733ae2d1ae 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -54,7 +54,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 {
                     IndexNumber = seasonParserResult.SeasonNumber,
                     SeriesId = series.Id,
-                    SeriesName = series.Name
+                    SeriesName = series.Name,
+                    Path = seasonParserResult.IsSeasonFolder ? path : args.Parent.Path
                 };
 
                 if (!season.IndexNumber.HasValue || !seasonParserResult.IsSeasonFolder)
diff --git a/MediaBrowser.XbmcMetadata/Providers/SeasonFromSeriesNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/SeasonFromSeriesNfoProvider.cs
index ee9257270a..a8bf4b4e14 100644
--- a/MediaBrowser.XbmcMetadata/Providers/SeasonFromSeriesNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/SeasonFromSeriesNfoProvider.cs
@@ -63,6 +63,16 @@ namespace MediaBrowser.XbmcMetadata.Providers
         /// <inheritdoc />
         protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
         {
+            var seasonPath = info.Path;
+            if (seasonPath is not null)
+            {
+                var path = Path.Combine(seasonPath, "tvshow.nfo");
+                if (Path.Exists(path))
+                {
+                    return directoryService.GetFile(path);
+                }
+            }
+
             var seriesPath = _libraryManager.GetItemById(info.ParentId)?.Path;
             if (seriesPath is not null)
             {