1 files changed, 10 insertions, 2 deletions
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index ac40f0b3a4..0ddb2ad67b 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -54,6 +55,12 @@ namespace MediaBrowser.Providers.Music
         {
             var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType);
 
+            // don't update user-changeable metadata for locked items
+            if (item.IsLocked)
+            {
+                return updateType;
+            }
+
             if (isFullRefresh || currentUpdateType > ItemUpdateType.None)
             {
                 if (!item.LockedFields.Contains(MetadataField.Name))
@@ -152,6 +159,7 @@ namespace MediaBrowser.Providers.Music
                     return ItemUpdateType.MetadataEdit;
                 }
             }
+
             return ItemUpdateType.None;
         }
 
@@ -180,7 +188,7 @@ namespace MediaBrowser.Providers.Music
                     PeopleHelper.AddPerson(people, new PersonInfo
                     {
                         Name = albumArtist,
-                        Type = "AlbumArtist"
+                        Type = PersonKind.AlbumArtist
                     });
                 }
 
@@ -189,7 +197,7 @@ namespace MediaBrowser.Providers.Music
                     PeopleHelper.AddPerson(people, new PersonInfo
                     {
                         Name = artist,
-                        Type = "Artist"
+                        Type = PersonKind.Artist
                     });
                 }