1 files changed, 15 insertions, 5 deletions

diff --git a/Emby.Server.Implementations/Library/ResolverHelper.cs b/Emby.Server.Implementations/Library/ResolverHelper.cs
index c9e3a4daf..ab6bc4907 100644
--- a/Emby.Server.Implementations/Library/ResolverHelper.cs
+++ b/Emby.Server.Implementations/Library/ResolverHelper.cs
@@ -136,23 +136,33 @@ namespace Emby.Server.Implementations.Library
 
             if (config.UseFileCreationTimeForDateAdded)
             {
-                // directoryService.getFile may return null
-                if (info is not null)
+                var fileCreationDate = info?.CreationTimeUtc;
+                if (fileCreationDate is not null)
                 {
-                    var dateCreated = info.CreationTimeUtc;
-
+                    var dateCreated = fileCreationDate;
                     if (dateCreated.Equals(DateTime.MinValue))
                     {
                         dateCreated = DateTime.UtcNow;
                     }
 
-                    item.DateCreated = dateCreated;
+                    item.DateCreated = dateCreated.Value;
                 }
             }
             else
             {
                 item.DateCreated = DateTime.UtcNow;
             }
+
+            if (info is not null && !info.IsDirectory)
+            {
+                item.Size = info.Length;
+            }
+
+            var fileModificationDate = info?.LastWriteTimeUtc;
+            if (fileModificationDate.HasValue)
+            {
+                item.DateModified = fileModificationDate.Value;
+            }
         }
     }
 }