1 files changed, 22 insertions, 14 deletions
diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs
index 864cb3050..7ec1eefcd 100644
--- a/MediaBrowser.Controller/Providers/MetadataResult.cs
+++ b/MediaBrowser.Controller/Providers/MetadataResult.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 #pragma warning disable CS1591
 
 using System;
@@ -10,16 +12,26 @@ namespace MediaBrowser.Controller.Providers
 {
     public class MetadataResult<T>
     {
+        // Images aren't always used so the allocation is a waste a lot of the time
+        private List<LocalImageInfo> _images;
+        private List<(string url, ImageType type)> _remoteImages;
+
         public MetadataResult()
         {
-            Images = new List<LocalImageInfo>();
-            RemoteImages = new List<(string url, ImageType type)>();
             ResultLanguage = "en";
         }
 
-        public List<LocalImageInfo> Images { get; set; }
+        public List<LocalImageInfo> Images
+        {
+            get => _images ??= new List<LocalImageInfo>();
+            set => _images = value;
+        }
 
-        public List<(string url, ImageType type)> RemoteImages { get; set; }
+        public List<(string url, ImageType type)> RemoteImages
+        {
+            get => _remoteImages ??= new List<(string url, ImageType type)>();
+            set => _remoteImages = value;
+        }
 
         public List<UserItemData> UserDataList { get; set; }
 
@@ -37,10 +49,7 @@ namespace MediaBrowser.Controller.Providers
 
         public void AddPerson(PersonInfo p)
         {
-            if (People == null)
-            {
-                People = new List<PersonInfo>();
-            }
+            People ??= new List<PersonInfo>();
 
             PeopleHelper.AddPerson(People, p);
         }
@@ -54,16 +63,15 @@ namespace MediaBrowser.Controller.Providers
             {
                 People = new List<PersonInfo>();
             }
-
-            People.Clear();
+            else
+            {
+                People.Clear();
+            }
         }
 
         public UserItemData GetOrAddUserData(string userId)
         {
-            if (UserDataList == null)
-            {
-                UserDataList = new List<UserItemData>();
-            }
+            UserDataList ??= new List<UserItemData>();
 
             UserItemData userData = null;