diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 58279af9ef..de3c1e415a 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -276,8 +276,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 var path = firstVideo.Path;
                 if (video.ExtraType != null)
                 {
-                    // TODO
-                    result.ExtraFiles.Add(files.First(f => string.Equals(f.FullName, path, StringComparison.OrdinalIgnoreCase)));
+                    result.ExtraFiles.Add(files.Find(f => string.Equals(f.FullName, path, StringComparison.OrdinalIgnoreCase)));
                     continue;
                 }
 
diff --git a/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
index 5d9ef1340c..b171d739a8 100644
--- a/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/VideoListResolverTests.cs
@@ -107,6 +107,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }
@@ -128,6 +129,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }
@@ -150,6 +152,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(3, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
             Assert.Equal(ExtraType.Trailer, result[2].ExtraType);
@@ -173,6 +176,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(3, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
             Assert.Equal(ExtraType.Trailer, result[2].ExtraType);
@@ -195,6 +199,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }
@@ -308,6 +313,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(4, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
             Assert.Equal(ExtraType.Trailer, result[2].ExtraType);
@@ -431,6 +437,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }
@@ -452,6 +459,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }
@@ -473,6 +481,7 @@ namespace Jellyfin.Naming.Tests.Video
                 }).ToList(),
                 _namingOptions).ToList();
 
+            Assert.Equal(2, result.Count);
             Assert.False(result[0].ExtraType.HasValue);
             Assert.Equal(ExtraType.Trailer, result[1].ExtraType);
         }