diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 464a621cf8..bd0c178fd8 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -3007,7 +3007,10 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            CreateItems(personsToSave, null, CancellationToken.None);
+            if (personsToSave.Count > 0)
+            {
+                CreateItems(personsToSave, null, CancellationToken.None);
+            }
         }
 
         private void StartScanInBackground()
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 6b93d8d87a..882abc9272 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -33,6 +33,7 @@ namespace MediaBrowser.Controller.Entities.Movies
         public override bool SupportsPeople => true;
 
         /// <inheritdoc />
+        [JsonIgnore]
         public IReadOnlyList<BaseItem> LocalTrailers => GetExtras()
             .Where(extra => extra.ExtraType == Model.Entities.ExtraType.Trailer)
             .ToArray();
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index dfaf03fdad..b9455721e1 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -26,6 +26,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             .ToArray();
 
         /// <inheritdoc />
+        [JsonIgnore]
         public IReadOnlyList<BaseItem> LocalTrailers => GetExtras()
             .Where(extra => extra.ExtraType == Model.Entities.ExtraType.Trailer)
             .ToArray();
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index dcc752f8c7..df47daedfb 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.Controller.Entities.TV
     public class Episode : Video, IHasTrailers, IHasLookupInfo<EpisodeInfo>, IHasSeries
     {
         /// <inheritdoc />
+        [JsonIgnore]
         public IReadOnlyList<BaseItem> LocalTrailers => GetExtras()
             .Where(extra => extra.ExtraType == Model.Entities.ExtraType.Trailer)
             .ToArray();
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index bdadc27757..a3c4a81fdc 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -50,6 +50,7 @@ namespace MediaBrowser.Controller.Entities.TV
         public override bool SupportsPeople => true;
 
         /// <inheritdoc />
+        [JsonIgnore]
         public IReadOnlyList<BaseItem> LocalTrailers => GetExtras()
             .Where(extra => extra.ExtraType == Model.Entities.ExtraType.Trailer)
             .ToArray();